Index: org.gvsig.projection.jcrs.lib/src/main/java/org/gvsig/crs/CrsFactory.java =================================================================== --- org.gvsig.projection.jcrs.lib/src/main/java/org/gvsig/crs/CrsFactory.java (revisione 746) +++ org.gvsig.projection.jcrs.lib/src/main/java/org/gvsig/crs/CrsFactory.java (copia locale) @@ -395,7 +395,7 @@ conn.setConnectionEPSG(); String sql = "SELECT coord_ref_sys_code FROM EPSG_COORDINATEREFERENCESYSTEM WHERE coord_ref_sys_kind = '" - + kind + "' AND REPLACE(REPLACE(LOWER(coord_ref_sys_name),' / ',' '),'-',' ') LIKE '%" + + kind + "' AND REPLACE(REPLACE(LOWER(coord_ref_sys_name),' / ',' '),'-',' ') LIKE '%" + normalizeESRI(source_sr_name) + "%' AND deprecated = 0"; logger.debug(sql); @@ -481,17 +481,17 @@ String source_proj4 = sr.ExportToProj4(); String target_proj4 = target_sr.ExportToProj4(); if (StringUtils.equals(source_proj4, target_proj4)) { - conn.close(); + conn.close(); logger.debug("ESRI:{} matches!", code); return code; } } catch (Exception e) { - logger.debug("gvSIG can't identify the ESRI code..."); + //logger.debug("Can't identify the ESRI code..."); } } conn.close(); - logger.debug("gvSIG can't identify the ESRI code..."); + logger.debug("Can't identify the ESRI code..."); return code0; } @@ -510,28 +510,31 @@ name = StringUtils.replace(name, "_CSRS", "(CSRS)"); name = StringUtils.replace(name, "_DEF_1976", "(76)"); name = StringUtils.replace(name, "_ED77", "(ED77)"); - name = StringUtils.replace(name, "_ft", "(ft)"); - name = StringUtils.replace(name, "_ftUS", "(ftUS)"); name = StringUtils.replace(name, "_HARN", "(HARN)"); name = StringUtils.replace(name, "_MA11", "(MA11)"); name = StringUtils.replace(name, "_NSRS2007", "(NSRS2007)"); name = StringUtils.replace(name, "_PA11", "(PA11)"); - name = StringUtils.replace(name, "_Paris", " (Paris)"); name = StringUtils.replace(name, "_StatePlane", ""); - if (StringUtils.contains(name, "_FIPS")) name = StringUtils.split(name, "_FIPS")[0]; - if (StringUtils.endsWith(name, "_m")) name = StringUtils.replace(name, "_m", "(m)"); + name = StringUtils.replaceAll(name, "(_FIPS_)\\d{4}", ""); + name = StringUtils.replaceAll(name, "_m$", "(m)"); name = StringUtils.replace(name, "1870_Madrid", "1870 (Madrid)"); name = StringUtils.replace(name, "83_2011", "83(2011)"); // e.g. NAD_1983_2011 --> NAD83(2011) + name = StringUtils.replaceAll(name, "Feet_Intl$", "(ft)"); + name = StringUtils.replaceAll(name, "Feet$", "(ftUS)"); name = StringUtils.replace(name, "Ferro", "(Ferro)"); + name = StringUtils.replaceAll(name, "ftUS$", "(ftUS)"); + name = StringUtils.replaceAll(name, "ft$", "(ft)"); name = StringUtils.replace(name, "Hungarian_1972", "HD72"); name = StringUtils.replace(name, "Indonesian_1974", "ID74"); - name = StringUtils.replace(name, "TC_1948", "TC(1948)"); + name = StringUtils.replace(name, "Lisboa", "Lisbon"); + name = StringUtils.replace(name, "Lisbon_Lisbon", "Lisbon (Lisbon)"); name = StringUtils.replace(name, "MGI_M", "MGI Austria M"); //"MGI_M" --> "MGI / Austria M" name = StringUtils.replace(name, "New_Brunswick_Stereographic", "New Brunswick Stereographic (ATS77)"); - name = StringUtils.replace(name, "Lisboa", "Lisbon"); - name = StringUtils.replace(name, "Lisbon_Lisbon", "Lisbon (Lisbon)"); name = StringUtils.replace(name, "Oslo_Norway", "(Oslo) NGO"); + name = StringUtils.replace(name, "Paris", "(Paris)"); + name = StringUtils.replace(name, "TC_1948", "TC(1948)"); + name = StringUtils.replace(name, "_", " "); name = StringUtils.lowerCase(name); return name;