Changeset 776

Timestamp:

Jun 14, 2016, 3:03:20 PM (9 years ago)

Author:

djay

Message:

Add the default EPSG:3857 to supported srs in ms export.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal_java.c (modified) (1 diff)
• service_internal_ms.c (modified) (5 diffs)

trunk/zoo-project/zoo-kernel/service_internal_java.c

@@ -79 +79 @@
       sprintf(classpath,"%s/",ntmp);
     }
-
   }
   sprintf(oclasspath,"-Djava.class.path=%s",classpath);

trunk/zoo-project/zoo-kernel/service_internal_ms.c

@@ -262 +262 @@
         
         char tmpSrss[256];
-        sprintf(tmpSrss,"EPSG:4326 EPSG:900913 %s",tmpSrs);
+        sprintf(tmpSrss,"EPSG:4326 EPSG:900913 EPSG:3857 %s",tmpSrs);
         
         msInsertHashTable(&(m->web.metadata), "ows_srs", tmpSrss);
@@ -305 +305 @@
           addToMap(output->content,"real_extent","true");
         }
-        msInsertHashTable(&(m->web.metadata),"ows_srs", "EPSG:4326 EPSG:900913");
-        msInsertHashTable(&(myLayer->metadata),"ows_srs","EPSG:4326 EPSG:900913");
+        msInsertHashTable(&(m->web.metadata),"ows_srs", "EPSG:4326 EPSG:900913 EPSG:3857");
+        msInsertHashTable(&(myLayer->metadata),"ows_srs","EPSG:4326 EPSG:900913 EPSG:3857");
       }
     }
@@ -318 +318 @@
       msLoadProjectionStringEPSG(&myLayer->projection,msSrs->value);
       char tmpSrs[128];
-      sprintf(tmpSrs,"%s EPSG:4326 EPSG:900913",msSrs->value);
+      sprintf(tmpSrs,"%s EPSG:4326 EPSG:900913 EPSG:3857",msSrs->value);
       msInsertHashTable(&(m->web.metadata),"ows_srs",tmpSrs);
       msInsertHashTable(&(myLayer->metadata),"ows_srs",tmpSrs);
@@ -324 +324 @@
       msLoadProjectionStringEPSG(&m->projection,"EPSG:4326");
       msLoadProjectionStringEPSG(&myLayer->projection,"EPSG:4326");
-      msInsertHashTable(&(m->web.metadata),"ows_srs","EPSG:4326 EPSG:900913");
-      msInsertHashTable(&(myLayer->metadata),"ows_srs","EPSG:4326 EPSG:900913");
+      msInsertHashTable(&(m->web.metadata),"ows_srs","EPSG:4326 EPSG:900913 EPSG:3857");
+      msInsertHashTable(&(myLayer->metadata),"ows_srs","EPSG:4326 EPSG:900913 EPSG:3857");
     }
     if(output!=NULL){
@@ -634 +634 @@
       addToMap(output->content,"crs_isGeographic","true");
       msLoadProjectionStringEPSG(&m->projection,"EPSG:4326");
-      msInsertHashTable(&(m->web.metadata), "ows_srs", "EPSG:4326 EPSG:900913");
-      msInsertHashTable(&(myLayer->metadata), "ows_srs", "EPSG:4326 EPSG:900913");
+      msInsertHashTable(&(m->web.metadata), "ows_srs", "EPSG:4326 EPSG:900913 EPSG:3857");
+      msInsertHashTable(&(myLayer->metadata), "ows_srs", "EPSG:4326 EPSG:900913 EPSG:3857");
     }