Proj_EPSG21781.patch

Antonio Falciano, 09/08/2014 03:31 AM

Download (2.6 KB)

View differences:

org.gvsig.projection.jcrs.lib/src/main/java/org/gvsig/crs/Proj4.java (copia locale)
46 46
import javax.units.ConversionException;
47 47
import javax.units.Unit;
48 48

  
49
import org.geotools.referencing.CRS;
49 50
import org.geotools.referencing.crs.DefaultGeographicCRS;
50 51
import org.geotools.referencing.crs.DefaultProjectedCRS;
51 52
import org.geotools.referencing.datum.DefaultGeodeticDatum;
52 53
import org.geotools.referencing.datum.DefaultPrimeMeridian;
53 54
import org.opengis.metadata.Identifier;
55
import org.opengis.referencing.NoSuchAuthorityCodeException;
54 56
import org.opengis.referencing.crs.CoordinateReferenceSystem;
55 57
import org.opengis.referencing.datum.Ellipsoid;
56 58
import org.opengis.referencing.datum.PrimeMeridian;
......
3383 3385
				}
3384 3386
			}
3385 3387
			String strProjectionAcronym=projectionAcronym[0];
3388
			if(isSomerc)
3389
				strProjectionAcronym="somerc";
3386 3390
			String strExtraProj4="";
3387 3391
			// Control de casos especiales
3388 3392
			boolean isLaborde=false;
......
3590 3594
						control=false;
3591 3595
					if(parameterName.equals("azimuth"))
3592 3596
						control=false;
3597
					//Parameters for EPSG:21781
3598
					if(parameterAcronym.equals("lonc"))
3599
						parameterAcronym="lon_0";
3600
					if(parameterAcronym.equals("k"))
3601
						parameterAcronym="k_0";	
3593 3602
				}
3594 3603
				if(isOmerc)
3595 3604
				{
......
3926 3935
			if(projectionName.equals("Oblique_Mercator"))
3927 3936
			{
3928 3937
				isOmerc=true;
3929
				// TODO Set isSomerc as true for EPSG:21781  
3930
				//if (crs.getCode()==21781)
3931
				//	isSomerc=true;
3938
				try {
3939
					if (crs==CRS.decode("EPSG:21781"))
3940
						isSomerc=true;
3941
				} catch (NoSuchAuthorityCodeException e) {
3942
					// TODO Auto-generated catch block
3943
					e.printStackTrace();
3944
				}
3932 3945
				for(int j=0;j<gtParameterNames.length;j++)
3933 3946
				{
3934 3947
					String gtParameterName=gtParameterNames[j].trim();
......
4010 4023
			String projAcronym=projectionAcronym[0];
4011 4024
			if(isLcc)
4012 4025
				projAcronym="lcc";
4026
			if(isSomerc)
4027
				projAcronym="somerc";
4013 4028
			String strExtraProj4="";
4014 4029
			// Control de casos especiales
4015 4030
			boolean isLaborde=false;
......
4208 4223
						control=false;
4209 4224
					if(parameterName.equals("azimuth"))
4210 4225
						control=false;
4226
					//Parameters for EPSG:21781
4227
					if(parameterAcronym.equals("lonc"))
4228
						parameterAcronym="lon_0";
4229
					if(parameterAcronym.equals("k"))
4230
						parameterAcronym="k_0";
4211 4231
				}
4212 4232
				if(isOmerc)
4213 4233
				{