Changeset 68131

Timestamp:

Mar 24, 2016, 7:12:07 AM (8 years ago)

Author:

mmetz

Message:

libproj: fix mixing of projection name and coordinate system name

File:

• grass/trunk/lib/proj/convert.c (modified) (7 diffs)

grass/trunk/lib/proj/convert.c

@@ -142 +142 @@
     }
     G_free(proj4mod);
+    sysname = G_find_key_value("name", proj_info);
+    if (sysname)
+        OSRSetProjCS(hSRS, sysname);
 
     if ((errcode = OSRExportToWkt(hSRS, &wkt)) != OGRERR_NONE) {
@@ -153 +156 @@
     haveparams = GPJ__get_datum_params(proj_info, &datum, &params);
 
-    if(ellpskv != NULL)
+    if (ellpskv != NULL)
         ellps = G_store(ellpskv);
     else
@@ -279 +282 @@
     char *pszProj4 = NULL, *pszRemaining;
     char *pszProj = NULL;
+    const char *pszProjCS = NULL;
     char *datum = NULL;
     struct gpj_datum dstruct;
@@ -358 +362 @@
             pszValue = "defined";
 
-
+        /* projection name */
         if (G_strcasecmp(pszToken, "proj") == 0) {
             /* The ll projection is known as longlat in PROJ.4 */
@@ -365 +369 @@
 
             pszProj = pszValue;
-            continue;
         }
 
@@ -384 +387 @@
         G_set_key_value(pszToken, pszValue, temp_projinfo);
     }
+    if (!pszProj)
+        G_warning(_("No projection name! Projection parameters likely to be meaningless."));
 
     *projinfo = G_create_key_value();
 
     /* -------------------------------------------------------------------- */
-    /*      Derive the user name for the projection.                        */
-    /* -------------------------------------------------------------------- */
-    if (pszProj) {
+    /*      Derive the user name for the coordinate system.                 */
+    /* -------------------------------------------------------------------- */
+    pszProjCS = OSRGetAttrValue(hSRS, "PROJCS", 0);
+    if (!pszProjCS)
+        pszProjCS = OSRGetAttrValue(hSRS, "GEOGCS", 0);
+
+    if (pszProjCS) {
+        G_set_key_value("name", pszProjCS, *projinfo);
+    }
+    else if (pszProj) {
         char path[4095];
         char name[80];
+        
+        /* use name of the projection as name for the coordinate system */
 
         sprintf(path, "%s/etc/proj/projections", G_gisbase());
@@ -400 +414 @@
         else
             G_set_key_value("name", pszProj, *projinfo);
-
-        G_set_key_value("proj", pszProj, *projinfo);
-    }
-    else
-        G_warning(_("No projection name! Projection parameters likely to be meaningless."));
+    }