- Timestamp:
- Nov 16, 2018, 3:09:05 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c
r886 r888 185 185 map* useMs=getMap(tmpI->content,"useMapserver"); 186 186 if((minNb==NULL || atoi(minNb->value)>=1) && useMs!=NULL && strncasecmp(useMs->value,"true",4)==0){ 187 int lIndex=0; 188 maps* lenv=getMaps(m,"lenv"); 189 if(getMapFromMaps(m,"lenv","mapErrorNb")==NULL) 190 setMapInMaps(m,"lenv","mapErrorNb","0"); 191 else{ 192 map* tmpV=getMapFromMaps(m,"lenv","mapErrorNb"); 193 lIndex=atoi(tmpV->value)+1; 194 addIntToMap(lenv->content,"mapErrorNb",lIndex); 195 } 187 196 setMapInMaps(m,"lenv","mapError","true"); 188 setMap InMaps(m,"lenv","locator",tmpI->name);197 setMapArray(lenv->content,"locator",lIndex,tmpI->name); 189 198 if(nbElements==NULL) 190 setMap InMaps(m,"lenv","message",_("The ZOO-Kernel was able to retrieve the data but could not read it as geographic data."));199 setMapArray(lenv->content,"message",lIndex,_("The ZOO-Kernel was able to retrieve the data but could not read it as geographic data.")); 191 200 else 192 setMap InMaps(m,"lenv","message",_("The ZOO-Kernel was able to retrieve the data but could not access any feature or pixel in te resulting file."));201 setMapArray(lenv->content,"message",lIndex,_("The ZOO-Kernel was able to retrieve the data but could not access any feature or pixel in te resulting file.")); 193 202 if(getMapFromMaps(m,"lenv","state")==NULL) 194 203 errorException (m, _("Unable to find any geographic data"), "WrongInputData", tmpI->name); … … 889 898 */ 890 899 tmpMap=getMap(output->content,"msStyle"); 900 if(tmpMap==NULL){ 901 switch(myLayer->type){ 902 case MS_LAYER_POLYGON: 903 tmpMap=getMapFromMaps(conf,"main","msStylePoly"); 904 break; 905 case MS_LAYER_LINE: 906 tmpMap=getMapFromMaps(conf,"main","msStyleLine"); 907 break; 908 default: 909 tmpMap=getMapFromMaps(conf,"main","msStylePoint"); 910 break; 911 } 912 } 891 913 if(tmpMap!=NULL) 892 914 msUpdateStyleFromString(myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles],tmpMap->value,0); … … 1135 1157 CPLErrorReset(); 1136 1158 GDALGetRasterStatistics( hBand, TRUE, TRUE, &pdfMin, &pdfMax, &pdfMean, &pdfStdDev); 1137 //GDALComputeRasterStatistics( hBand, TRUE, &pdfMin, &pdfMax, &pdfMean, &pdfStdDev, NULL,NULL);1138 1159 char tmpN[21]; 1139 1160 sprintf(tmpN,"Band%d",iBand+1);
Note: See TracChangeset
for help on using the changeset viewer.