Revision: 5003
http://sourceforge.net/p/jump-pilot/code/5003
Author: michaudm
Date: 2016-09-01 20:46:42 +0000 (Thu, 01 Sep 2016)
Log Message:
-----------
Few typos
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/org/openjump/core/ccordsys/utils/ProjUtils.java
core/trunk/src/org/openjump/core/ccordsys/utils/srid.txt
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2016-09-01 04:42:33 UTC (rev 5002)
+++ core/trunk/ChangeLog 2016-09-01 20:46:42 UTC (rev 5003)
@@ -4,7 +4,7 @@
#<-------------------------------- 80 chars
---------------------------------->#
2016-09-01 Giuseppe Aruta <giuseppe_ar...@yahoo.it>
- * File projection detection: Added INGF and ING G\xE8oportail codes
+ * File projection detection: Added IGNF and IGN G\xE9oportail codes
* File projection detection: Added measure units
2016-07-18 ede
Modified: core/trunk/src/org/openjump/core/ccordsys/utils/ProjUtils.java
===================================================================
--- core/trunk/src/org/openjump/core/ccordsys/utils/ProjUtils.java
2016-09-01 04:42:33 UTC (rev 5002)
+++ core/trunk/src/org/openjump/core/ccordsys/utils/ProjUtils.java
2016-09-01 20:46:42 UTC (rev 5003)
@@ -277,8 +277,7 @@
* strings like "NAD83 UTM zone 10N" or "26910" both return
* "SRID:26910 - NAD83 UTM zone 10N".
*
- * @param auxiliary
- * file path
+ * @param fileSourcePath auxiliary file path
* @return <String> SRID and Projection definition
* @throws URISyntaxException
* @throws IOException
@@ -364,7 +363,7 @@
+ line2.replaceAll("[<\\>]", " ")
.replaceAll(";", " - ");
// ESRI codes range
- } else if (srid > 32999 & srid < 200000) {
+ } else if (srid > 32999 && srid < 200000) {
SRSDef = "ESRI:"
+ line2.replaceAll("[<\\>]", " ")
.replaceAll(";", " - ");
@@ -374,7 +373,7 @@
+ line2.replaceAll("[<\\>]", " ")
.replaceAll(";", " - ");
}
- // Non numeral SRID like INGF
+ // Non numeral SRID like IGNF
} catch (NumberFormatException e) {
SRSDef = "SRID:"
+ line2.replaceAll("[<\\>]", " ")
@@ -509,7 +508,7 @@
+ line2.replaceAll("[<\\>]", " ")
.replaceAll(";", " - ");
// ESRI codes range
- } else if (srid > 32999 & srid < 200000) {
+ } else if (srid > 32999 && srid < 200000) {
SRSDef = "ESRI:"
+ line2.replaceAll("[<\\>]", " ")
.replaceAll(";", " - ");
@@ -519,7 +518,7 @@
+ line2.replaceAll("[<\\>]", " ")
.replaceAll(";", " - ");
}
- // Non numeral SRID like INGF
+ // Non numeral SRID like IGNF
} catch (NumberFormatException e) {
SRSDef = "SRID:"
+ line2.replaceAll("[<\\>]", " ")
@@ -545,8 +544,7 @@
/**
* Method to show an OGC WKT string in a more readable style
*
- * @param String
- * OGC WKT from auxiliary proj file
+ * @param WKT OGC WKT from auxiliary proj file
* @return Readable string
*/
public static String readableFormatWKTCode(String WKT) {
@@ -641,8 +639,7 @@
* It returns the path name of the auxiliary file (AUX.XML or PRJ file)
* where a projection code is located
*
- * @param auxiliary
- * file path
+ * @param fileSourcePath auxiliary file path
* @return <String> path name of projection auxiliary file
* @throws IOException
*/
@@ -711,8 +708,7 @@
* searche querries like "NAD83 UTM zone 10N" or "26910" both return
* "SRID:26910 - NAD83 UTM zone 10N".
*
- * @param <String>
- * searchQuery
+ * @param searchQuery search quaery
* @return <String> SRID and Projection definition
* @throws URISyntaxException
* @throws IOException
@@ -752,7 +748,7 @@
+ line2.replaceAll("[<\\>]", " ")
.replaceAll(";", " - ");
// ESRI codes range
- } else if (srid > 32999 & srid < 200000) {
+ } else if (srid > 32999 && srid < 200000) {
SRSDef = "ESRI:"
+ line2.replaceAll("[<\\>]", " ")
.replaceAll(";", " - ");
@@ -762,7 +758,7 @@
+ line2.replaceAll("[<\\>]", " ")
.replaceAll(";", " - ");
}
- // Non numeral SRID like INGF
+ // Non numeral SRID like IGNF
} catch (NumberFormatException e) {
SRSDef = "SRID:"
+ line2.replaceAll("[<\\>]", " ").replaceAll(
@@ -960,9 +956,8 @@
* substring to a line, it returns its SRID. For instance, search strings
* like "NAD83 UTM zone 10N" returns "26910".
*
- * @param auxiliary
- * file path
- * @return <String> SRID
+ * @param fileSourcePath auxiliary file path
+ * @return SRID as String
* @throws URISyntaxException
* @throws IOException
*/
Modified: core/trunk/src/org/openjump/core/ccordsys/utils/srid.txt
===================================================================
--- core/trunk/src/org/openjump/core/ccordsys/utils/srid.txt 2016-09-01
04:42:33 UTC (rev 5002)
+++ core/trunk/src/org/openjump/core/ccordsys/utils/srid.txt 2016-09-01
20:46:42 UTC (rev 5003)
@@ -4,7 +4,7 @@
#[05_22_2016 - Giuseppe Aruta]
# * First realize
#[09_01_2016 - Giuseppe Aruta]
-# * Added INGF and ING G\xE8oportail codes
+# * Added IGNF and IGN G\xE9oportail codes
# * Added measure units
#The srid codes are organized in the following way
#<COORD_REF_SYS_CODE>;<COORD_REF_SYS_NAME>;[COORD_REF_SYS_UNIT]
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
