svn commit: r1804459 - /sis/branches/ISO-19115-3/
Author: desruisseaux Date: Tue Aug 8 18:48:55 2017 New Revision: 1804459 URL: http://svn.apache.org/viewvc?rev=1804459=rev Log: Create a branch for merging work from Alexander Montgomery and Cullen Rombach on ISO 19115-3 update (XML for metadata). Added: sis/branches/ISO-19115-3/ (props changed) - copied from r1804458, sis/branches/JDK8/ Propchange: sis/branches/ISO-19115-3/ -- --- svn:ignore (added) +++ svn:ignore Tue Aug 8 18:48:55 2017 @@ -0,0 +1 @@ +target Propchange: sis/branches/ISO-19115-3/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Aug 8 18:48:55 2017 @@ -0,0 +1,4 @@ +/sis/branches/Android:1430670-1480699 +/sis/branches/JDK6:1394913-1508480 +/sis/branches/JDK9:1773327-1803064 +/sis/trunk:1394364-1508466,1519089-1519674
svn commit: r1804443 - /sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
Author: desruisseaux
Date: Tue Aug 8 16:48:42 2017
New Revision: 1804443
URL: http://svn.apache.org/viewvc?rev=1804443=rev
Log:
Upgrade to EPSG geodetic dataset version 9.1.
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java?rev=1804443=1804442=1804443=diff
==
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
[UTF-8] Tue Aug 8 16:48:42 2017
@@ -143,6 +143,7 @@ public final strictfp class CoordinateRe
rd("Deutsches Haupthoehennetz 1912",
"Deutsches Haupthoehennetz");
rd("Deutsches Haupthoehennetz 1985",
"Deutsches Haupthoehennetz");
rd("Deutsches Haupthoehennetz 1992",
"Deutsches Haupthoehennetz");
+rd("Deutsches Haupthoehennetz 2016",
"Deutsches Haupthoehennetz");
rd("Douala 1948",
"Douala");
rd("Dunedin 1958",
"Dunedin");
rd("Dunedin-Bluff 1960",
"Dunedin");
@@ -159,6 +160,15 @@ public final strictfp class CoordinateRe
rd("European Datum 1950(1977)",
"European Datum");
rd("European Datum 1979",
"European Datum");
rd("European Datum 1987",
"European Datum");
+rd("European Terrestrial Reference Frame 1989",
"European Terrestrial Reference Frame");
+rd("European Terrestrial Reference Frame 1990",
"European Terrestrial Reference Frame");
+rd("European Terrestrial Reference Frame 1991",
"European Terrestrial Reference Frame");
+rd("European Terrestrial Reference Frame 1992",
"European Terrestrial Reference Frame");
+rd("European Terrestrial Reference Frame 1993",
"European Terrestrial Reference Frame");
+rd("European Terrestrial Reference Frame 1994",
"European Terrestrial Reference Frame");
+rd("European Terrestrial Reference Frame 1996",
"European Terrestrial Reference Frame");
+rd("European Terrestrial Reference Frame 1997",
"European Terrestrial Reference Frame");
+rd("European Terrestrial Reference Frame 2000",
"European Terrestrial Reference Frame");
rd("European Vertical Reference Frame 2000",
"European Vertical Reference Frame");
rd("European Vertical Reference Frame 2007",
"European Vertical Reference Frame");
rd("Fahud Height Datum",
"Fahud");
@@ -220,8 +230,11 @@ public final strictfp class CoordinateRe
rd("International Terrestrial Reference Frame 2000",
"International Terrestrial Reference Frame");
rd("International Terrestrial Reference Frame 2005",
"International Terrestrial Reference Frame");
rd("International Terrestrial Reference Frame 2008",
"International Terrestrial Reference Frame");
+rd("International Terrestrial Reference Frame 2014",
"International Terrestrial Reference Frame");
rd("Islands Net 1993",
"Islands Net");
rd("Islands Net 2004",
"Islands Net");
+rd("Israeli Geodetic Datum 2005",
"Israeli Geodetic Datum");
+rd("Israeli Geodetic Datum 2005(2012)",
"Israeli Geodetic Datum");
rd("Jamaica 1875",
"Jamaica");
rd("Jamaica 1969",
"Jamaica");
rd("Jamaica 2001",
"Jamaica");
@@ -294,16 +307,24 @@ public final strictfp class CoordinateRe
rd("NAD83 (National Spatial Reference System 2011)",
"North American Datum 1983 — National Spatial Reference System 2011");
rd("NAD83 (National Spatial Reference System MA11)",
"North American Datum 1983 —
svn commit: r1804442 - /sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java
Author: desruisseaux
Date: Tue Aug 8 16:48:25 2017
New Revision: 1804442
URL: http://svn.apache.org/viewvc?rev=1804442=rev
Log:
Fix construction of geocentric CRS.
Modified:
sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java
Modified:
sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java?rev=1804442=1804441=1804442=diff
==
---
sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java
[UTF-8] Tue Aug 8 16:48:25 2017
@@ -16,6 +16,7 @@
*/
package org.apache.sis.storage.gdal;
+import java.util.Arrays;
import java.util.Map;
import java.util.Set;
import java.util.HashMap;
@@ -271,7 +272,7 @@ public class Proj4Factory extends Geodet
/**
* Returns the set of authority codes for objects of the given type.
* Current implementation can not return complete Proj.4 definition
strings.
- * Instead, this method currently returns only fragments (e.g. {@code
"+init="}).
+ * Instead, this method currently returns only fragments (e.g. {@code
"+proj=lcc"}).
*
* @param type the spatial reference objects type.
* @return fragments of definition strings for spatial reference objects
of the given type.
@@ -279,19 +280,21 @@ public class Proj4Factory extends Geodet
*/
@Override
public Set getAuthorityCodes(Class
type) throws FactoryException {
-final String method;
-if (type.isAssignableFrom(ProjectedCRS.class)) {//
Must be tested first.
-method = "";
-} else if (type.isAssignableFrom(GeographicCRS.class)) {//
Should be tested before GeocentricCRS.
-method = "latlon";
-} else if (type.isAssignableFrom(GeocentricCRS.class)) {
-method = "geocent";
-} else {
-return Collections.emptySet();
+final Set codes = new LinkedHashSet<>(10);
+if (type.isAssignableFrom(GeographicCRS.class)) {
+codes.add("latlon");
+}
+if (type.isAssignableFrom(GeocentricCRS.class)) {
+codes.add("geocent");
+}
+if (type.isAssignableFrom(ProjectedCRS.class)) {
+codes.addAll(Arrays.asList("lcc", "merc", "tmerc", "stere")); //
Only a subset of supported projections.
+}
+final String[] methods = codes.toArray(new String[codes.size()]);
+codes.clear();
+for (final String method : methods) {
+codes.add(PROJ_PARAM.concat(method));
}
-final Set codes = new LinkedHashSet<>(4);
-codes.add("+init=");
-codes.add(PROJ_PARAM.concat(method));
return codes;
}
@@ -573,16 +576,22 @@ public class Proj4Factory extends Geodet
private CoordinateReferenceSystem createCRS(final PJ pj, final boolean
withHeight) throws FactoryException {
final PJ.Type type = pj.getType();
final boolean geographic = PJ.Type.GEOGRAPHIC.equals(type);
+final boolean geocentric = PJ.Type.GEOCENTRIC.equals(type);
final Proj4Parser parser = new Proj4Parser(pj.getCode());
final String dir = parser.value("axis", "enu");
-final CoordinateSystemAxis[] axes = new
CoordinateSystemAxis[withHeight ? dir.length() : 2];
+final CoordinateSystemAxis[] axes = new
CoordinateSystemAxis[geocentric | withHeight ? dir.length() : 2];
for (int i=0; i
svn commit: r1804441 - /sis/site/trunk/content/tables/CoordinateReferenceSystems.html
Author: desruisseaux Date: Tue Aug 8 16:46:48 2017 New Revision: 1804441 URL: http://svn.apache.org/viewvc?rev=1804441=rev Log: Fix the ordering for a few codes. Modified: sis/site/trunk/content/tables/CoordinateReferenceSystems.html Modified: sis/site/trunk/content/tables/CoordinateReferenceSystems.html URL: http://svn.apache.org/viewvc/sis/site/trunk/content/tables/CoordinateReferenceSystems.html?rev=1804441=1804440=1804441=diff == --- sis/site/trunk/content/tables/CoordinateReferenceSystems.html [UTF-8] (original) +++ sis/site/trunk/content/tables/CoordinateReferenceSystems.html [UTF-8] Tue Aug 8 16:46:48 2017 @@ -2673,16 +2673,16 @@ EPSG:4420NAD83 / BLM 60N (ftUS)Transverse Mercator EPSG:3310NAD83 / California AlbersAlbers Equal Area EPSG:2225NAD83 / California zone 1 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26941NAD83 / California zone 1Lambert Conic Conformal (2SP) -EPSG:2226NAD83 / California zone 2 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26942NAD83 / California zone 2Lambert Conic Conformal (2SP) -EPSG:2227NAD83 / California zone 3 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26943NAD83 / California zone 3Lambert Conic Conformal (2SP) +EPSG:2226NAD83 / California zone 2 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2227NAD83 / California zone 3 (ftUS)Lambert Conic Conformal (2SP) EPSG:2228NAD83 / California zone 4 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26944NAD83 / California zone 4Lambert Conic Conformal (2SP) EPSG:2229NAD83 / California zone 5 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26945NAD83 / California zone 5Lambert Conic Conformal (2SP) -EPSG:2230NAD83 / California zone 6 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2230NAD83 / California zone 6 (ftUS)Lambert Conic Conformal (2SP) +EPSG:26941NAD83 / California zone 1Lambert Conic Conformal (2SP) +EPSG:26942NAD83 / California zone 2Lambert Conic Conformal (2SP) +EPSG:26943NAD83 / California zone 3Lambert Conic Conformal (2SP) +EPSG:26944NAD83 / California zone 4Lambert Conic Conformal (2SP) +EPSG:26945NAD83 / California zone 5Lambert Conic Conformal (2SP) EPSG:26946NAD83 / California zone 6Lambert Conic Conformal (2SP) EPSG:3978NAD83 / Canada Atlas LambertLambert Conic Conformal (2SP) EPSG:2232NAD83 / Colorado Central (ftUS)Lambert Conic Conformal (2SP) @@ -3147,16 +3147,16 @@ EPSG:3442NAD83(HARN) / Arkansas South (ftUS)Lambert Conic Conformal (2SP) EPSG:3311NAD83(HARN) / California AlbersAlbers Equal Area EPSG:2766NAD83(HARN) / California zone 1Lambert Conic Conformal (2SP) -EPSG:2870NAD83(HARN) / California zone 1 (ftUS)Lambert Conic Conformal (2SP) EPSG:2767NAD83(HARN) / California zone 2Lambert Conic Conformal (2SP) -EPSG:2871NAD83(HARN) / California zone 2 (ftUS)Lambert Conic Conformal (2SP) -EPSG:2768NAD83(HARN) / California zone 3Lambert Conic Conformal (2SP) -EPSG:2872NAD83(HARN) / California zone 3 (ftUS)Lambert Conic Conformal (2SP) -EPSG:2769NAD83(HARN) / California zone 4Lambert Conic Conformal (2SP) -EPSG:2873NAD83(HARN) / California zone 4 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2768NAD83(HARN) / California zone 3Lambert Conic Conformal (2SP) +EPSG:2769NAD83(HARN) / California zone 4Lambert Conic Conformal (2SP) EPSG:2770NAD83(HARN) / California zone 5Lambert Conic Conformal (2SP) -EPSG:2874NAD83(HARN) / California zone 5 (ftUS)Lambert Conic Conformal (2SP) EPSG:2771NAD83(HARN) / California zone 6Lambert Conic Conformal (2SP) +EPSG:2870NAD83(HARN) / California zone 1 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2871NAD83(HARN) / California zone 2 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2872NAD83(HARN) / California zone 3 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2873NAD83(HARN) / California zone 4 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2874NAD83(HARN) / California zone 5 (ftUS)Lambert Conic Conformal (2SP) EPSG:2875NAD83(HARN) / California zone 6 (ftUS)Lambert Conic Conformal (2SP) EPSG:2773NAD83(HARN) / Colorado CentralLambert Conic Conformal (2SP) EPSG:2877NAD83(HARN) / Colorado Central (ftUS)Lambert Conic Conformal (2SP) @@ -4416,17 +4416,17 @@ EPSG:27564NTF (Paris) / Lambert CorseLambert Conic Conformal (1SP) EPSG:27561NTF (Paris) / Lambert Nord FranceLambert Conic Conformal (1SP) EPSG:27563NTF (Paris) / Lambert Sud FranceLambert Conic Conformal (1SP) -EPSG:27571NTF (Paris) / Lambert zone ILambert Conic Conformal (1SP) EPSG:5707NTF (Paris) / Lambert zone I + NGF-IGN69 heightLambert Conic Conformal (1SP) + Geoidal height -EPSG:27572NTF (Paris) / Lambert zone IILambert Conic Conformal (1SP) +EPSG:5708NTF (Paris) / Lambert zone IV + NGF-IGN78 heightLambert Conic Conformal (1SP) + Geoidal height +EPSG:7411NTF (Paris) / Lambert zone II + NGF Lallemand heightLambert Conic Conformal (1SP) + Geoidal height EPSG:7412NTF (Paris) / Lambert zone II + NGF IGN69Superseded by 7421. -EPSG:7411NTF (Paris) / Lambert zone II + NGF Lallemand
svn commit: r1016554 - in /websites/staging/sis/trunk/content: ./ tables/CoordinateReferenceSystems.html
Author: buildbot Date: Tue Aug 8 16:46:54 2017 New Revision: 1016554 Log: Staging update by buildbot for sis Modified: websites/staging/sis/trunk/content/ (props changed) websites/staging/sis/trunk/content/tables/CoordinateReferenceSystems.html Propchange: websites/staging/sis/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Aug 8 16:46:54 2017 @@ -1 +1 @@ -1804440 +1804441 Modified: websites/staging/sis/trunk/content/tables/CoordinateReferenceSystems.html == --- websites/staging/sis/trunk/content/tables/CoordinateReferenceSystems.html (original) +++ websites/staging/sis/trunk/content/tables/CoordinateReferenceSystems.html Tue Aug 8 16:46:54 2017 @@ -2673,16 +2673,16 @@ EPSG:4420NAD83 / BLM 60N (ftUS)Transverse Mercator EPSG:3310NAD83 / California AlbersAlbers Equal Area EPSG:2225NAD83 / California zone 1 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26941NAD83 / California zone 1Lambert Conic Conformal (2SP) -EPSG:2226NAD83 / California zone 2 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26942NAD83 / California zone 2Lambert Conic Conformal (2SP) -EPSG:2227NAD83 / California zone 3 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26943NAD83 / California zone 3Lambert Conic Conformal (2SP) +EPSG:2226NAD83 / California zone 2 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2227NAD83 / California zone 3 (ftUS)Lambert Conic Conformal (2SP) EPSG:2228NAD83 / California zone 4 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26944NAD83 / California zone 4Lambert Conic Conformal (2SP) EPSG:2229NAD83 / California zone 5 (ftUS)Lambert Conic Conformal (2SP) -EPSG:26945NAD83 / California zone 5Lambert Conic Conformal (2SP) -EPSG:2230NAD83 / California zone 6 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2230NAD83 / California zone 6 (ftUS)Lambert Conic Conformal (2SP) +EPSG:26941NAD83 / California zone 1Lambert Conic Conformal (2SP) +EPSG:26942NAD83 / California zone 2Lambert Conic Conformal (2SP) +EPSG:26943NAD83 / California zone 3Lambert Conic Conformal (2SP) +EPSG:26944NAD83 / California zone 4Lambert Conic Conformal (2SP) +EPSG:26945NAD83 / California zone 5Lambert Conic Conformal (2SP) EPSG:26946NAD83 / California zone 6Lambert Conic Conformal (2SP) EPSG:3978NAD83 / Canada Atlas LambertLambert Conic Conformal (2SP) EPSG:2232NAD83 / Colorado Central (ftUS)Lambert Conic Conformal (2SP) @@ -3147,16 +3147,16 @@ EPSG:3442NAD83(HARN) / Arkansas South (ftUS)Lambert Conic Conformal (2SP) EPSG:3311NAD83(HARN) / California AlbersAlbers Equal Area EPSG:2766NAD83(HARN) / California zone 1Lambert Conic Conformal (2SP) -EPSG:2870NAD83(HARN) / California zone 1 (ftUS)Lambert Conic Conformal (2SP) EPSG:2767NAD83(HARN) / California zone 2Lambert Conic Conformal (2SP) -EPSG:2871NAD83(HARN) / California zone 2 (ftUS)Lambert Conic Conformal (2SP) -EPSG:2768NAD83(HARN) / California zone 3Lambert Conic Conformal (2SP) -EPSG:2872NAD83(HARN) / California zone 3 (ftUS)Lambert Conic Conformal (2SP) -EPSG:2769NAD83(HARN) / California zone 4Lambert Conic Conformal (2SP) -EPSG:2873NAD83(HARN) / California zone 4 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2768NAD83(HARN) / California zone 3Lambert Conic Conformal (2SP) +EPSG:2769NAD83(HARN) / California zone 4Lambert Conic Conformal (2SP) EPSG:2770NAD83(HARN) / California zone 5Lambert Conic Conformal (2SP) -EPSG:2874NAD83(HARN) / California zone 5 (ftUS)Lambert Conic Conformal (2SP) EPSG:2771NAD83(HARN) / California zone 6Lambert Conic Conformal (2SP) +EPSG:2870NAD83(HARN) / California zone 1 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2871NAD83(HARN) / California zone 2 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2872NAD83(HARN) / California zone 3 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2873NAD83(HARN) / California zone 4 (ftUS)Lambert Conic Conformal (2SP) +EPSG:2874NAD83(HARN) / California zone 5 (ftUS)Lambert Conic Conformal (2SP) EPSG:2875NAD83(HARN) / California zone 6 (ftUS)Lambert Conic Conformal (2SP) EPSG:2773NAD83(HARN) / Colorado CentralLambert Conic Conformal (2SP) EPSG:2877NAD83(HARN) / Colorado Central (ftUS)Lambert Conic Conformal (2SP) @@ -4416,17 +4416,17 @@ EPSG:27564NTF (Paris) / Lambert CorseLambert Conic Conformal (1SP) EPSG:27561NTF (Paris) / Lambert Nord FranceLambert Conic Conformal (1SP) EPSG:27563NTF (Paris) / Lambert Sud FranceLambert Conic Conformal (1SP) -EPSG:27571NTF (Paris) / Lambert zone ILambert Conic Conformal (1SP) EPSG:5707NTF (Paris) / Lambert zone I + NGF-IGN69 heightLambert Conic Conformal (1SP) + Geoidal height -EPSG:27572NTF (Paris) / Lambert zone IILambert Conic Conformal (1SP) +EPSG:5708NTF (Paris) / Lambert zone IV + NGF-IGN78 heightLambert Conic Conformal (1SP) + Geoidal height +EPSG:7411NTF (Paris) / Lambert zone II + NGF Lallemand heightLambert Conic Conformal (1SP)
svn commit: r1804440 [2/2] - /sis/site/trunk/content/tables/CoordinateReferenceSystems.html
Modified: sis/site/trunk/content/tables/CoordinateReferenceSystems.html URL: http://svn.apache.org/viewvc/sis/site/trunk/content/tables/CoordinateReferenceSystems.html?rev=1804440=1804439=1804440=diff == --- sis/site/trunk/content/tables/CoordinateReferenceSystems.html [UTF-8] (original) +++ sis/site/trunk/content/tables/CoordinateReferenceSystems.html [UTF-8] Tue Aug 8 16:41:05 2017 @@ -10,16 +10,16 @@ Apache SIS™ Coordinate Reference System (CRS) codes - This list is generated from the EPSG dataset version 9.0, together with other sources. + This list is generated from the EPSG dataset version 9.1, together with other sources. All those Coordinate Reference Systems (CRS) are supported by the http://sis.apache.org;>Apache SIS™ library version 0.8 (provided that http://sis.apache.org/epsg.html;>a connection to an EPSG database exists), except those with a red text in the last column. - There is 5940 codes, 97% of them being supported. + There is 6121 codes, 97% of them being supported. Notation: - The ↷ symbol in front of authority codes (33% of them) identifies left-handed coordinate systems (for example with latitude axis before longitude). - The codes with a strike (8% of them) identify deprecated CRS. In some cases, the remarks column indicates the replacement. + The ↷ symbol in front of authority codes (32% of them) identifies left-handed coordinate systems (for example with latitude axis before longitude). + The codes with a strike (7% of them) identify deprecated CRS. In some cases, the remarks column indicates the replacement. @@ -681,10 +681,9 @@ EPSG:3068DHDN / Soldner BerlinNo operation method found for name or identifier “Cassini-Soldner”. Deutsches Haupthoehennetz EPSG:7699DHHN12 heightGeoidal height -EPSG:5784DHHN85 heightGeoidal height -EPSG:5783DHHN92 heightGeoidal height -Deutsches Haupthoehennetz 2016 EPSG:7837DHHN2016 heightGeoidal height +EPSG:5784DHHN85 heightGeoidal height +EPSG:5783DHHN92 heightGeoidal height Diego Garcia 1969 ↷EPSG:4724Diego Garcia 1969Geographic Dominica 1945 @@ -789,6 +788,25 @@ EPSG:2078ELD79 / UTM zone 33NTransverse Mercator EPSG:2079ELD79 / UTM zone 34NTransverse Mercator EPSG:2080ELD79 / UTM zone 35NTransverse Mercator +European Terrestrial Reference Frame +EPSG:7930ETRF2000Geocentric (Cartesian coordinate system) +↷EPSG:7931ETRF2000Geographic 3D +EPSG:7914ETRF89Geocentric (Cartesian coordinate system) +↷EPSG:7915ETRF89Geographic 3D +EPSG:7916ETRF90Geocentric (Cartesian coordinate system) +↷EPSG:7917ETRF90Geographic 3D +EPSG:7918ETRF91Geocentric (Cartesian coordinate system) +↷EPSG:7919ETRF91Geographic 3D +EPSG:7920ETRF92Geocentric (Cartesian coordinate system) +↷EPSG:7921ETRF92Geographic 3D +EPSG:7922ETRF93Geocentric (Cartesian coordinate system) +↷EPSG:7923ETRF93Geographic 3D +EPSG:7924ETRF94Geocentric (Cartesian coordinate system) +↷EPSG:7925ETRF94Geographic 3D +EPSG:7926ETRF96Geocentric (Cartesian coordinate system) +↷EPSG:7927ETRF96Geographic 3D +EPSG:7928ETRF97Geocentric (Cartesian coordinate system) +↷EPSG:7929ETRF97Geographic 3D European Terrestrial Reference System 1989 ↷EPSG:4258ETRS89Geographic EPSG:4936ETRS89Geocentric (Cartesian coordinate system) @@ -1128,22 +1146,44 @@ EPSG:7842GDA2020Geocentric (Cartesian coordinate system) ↷EPSG:7843GDA2020Geographic 3D ↷EPSG:7844GDA2020Geographic -EPSG:7845GDA2020 / GA LCCLambert Conic Conformal (2SP) +EPSG:8013GDA2020 / ALB2020Transverse Mercator +EPSG:8016GDA2020 / BCG2020Transverse Mercator +EPSG:8014GDA2020 / BIO2020Transverse Mercator +EPSG:8015GDA2020 / BRO2020Transverse Mercator +EPSG:8017GDA2020 / CARN2020Transverse Mercator +EPSG:8018GDA2020 / CIG2020Transverse Mercator +EPSG:8019GDA2020 / CKIG2020Transverse Mercator +EPSG:8020GDA2020 / COL2020Transverse Mercator +EPSG:8021GDA2020 / ESP2020Transverse Mercator +EPSG:8022GDA2020 / EXM2020Transverse Mercator +EPSG:7845GDA2020 / GA LCCLambert Conic Conformal (2SP) +EPSG:8023GDA2020 / GCG2020Transverse Mercator +EPSG:8024GDA2020 / GOLD2020Transverse Mercator +EPSG:8025GDA2020 / JCG2020Transverse Mercator +EPSG:8026GDA2020 / KALB2020Transverse Mercator +EPSG:8027GDA2020 / KAR2020Transverse Mercator +EPSG:8028GDA2020 / KUN2020Transverse Mercator +EPSG:8029GDA2020 / LCG2020Transverse Mercator EPSG:7846GDA2020 / MGA zone 46Transverse Mercator -EPSG:7847GDA2020 / MGA zone 47Transverse Mercator +EPSG:7847GDA2020 / MGA zone 47Transverse Mercator EPSG:7848GDA2020 / MGA zone 48Transverse Mercator -EPSG:7849GDA2020 / MGA zone 49Transverse Mercator +EPSG:7849GDA2020 / MGA zone 49Transverse Mercator EPSG:7850GDA2020 / MGA zone 50Transverse Mercator -EPSG:7851GDA2020 / MGA zone 51Transverse Mercator +EPSG:7851GDA2020 / MGA zone 51Transverse Mercator EPSG:7852GDA2020 / MGA zone 52Transverse Mercator
svn commit: r1016553 [1/2] - in /websites/staging/sis/trunk/content: ./ tables/CoordinateReferenceSystems.html
Author: buildbot Date: Tue Aug 8 16:41:14 2017 New Revision: 1016553 Log: Staging update by buildbot for sis Modified: websites/staging/sis/trunk/content/ (props changed) websites/staging/sis/trunk/content/tables/CoordinateReferenceSystems.html Propchange: websites/staging/sis/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Aug 8 16:41:14 2017 @@ -1 +1 @@ -1799207 +1804440
svn commit: r1804440 [1/2] - /sis/site/trunk/content/tables/CoordinateReferenceSystems.html
Author: desruisseaux Date: Tue Aug 8 16:41:05 2017 New Revision: 1804440 URL: http://svn.apache.org/viewvc?rev=1804440=rev Log: Update the table of supported CRS codes. Modified: sis/site/trunk/content/tables/CoordinateReferenceSystems.html
svn commit: r1804432 [2/2] - /sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql
Modified: sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql?rev=1804432=1804431=1804432=diff == --- sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql [ISO-8859-1] (original) +++ sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql [ISO-8859-1] Tue Aug 8 14:56:55 2017 @@ -7,7 +7,6 @@ --- INSERT INTO epsg_alias VALUES -(4,'Datum',6258,7300,'ETRF89',''), (5,'Ellipsoid',7013,7300,'Modified Clarke 1880 (South Africa)','The Clarke 1880 (Arc) figure is one of several modifications to the original definition. The name Clarke Modified is usually taken to be the RGS modification. But in southern Africa it is usually taken to be the Arc or Cape modification.'), (6,'Coordinate_Operation',8570,7300,'ED50 to EUREF89 (2)',''), (7,'Unit of Measure',9001,7300,'meter',''), @@ -46,7 +45,6 @@ INSERT INTO epsg_alias VALUES (43,'Coordinate Reference System',4211,7301,'Genuk',''), (44,'Coordinate Reference System',4218,7301,'Bogota',''), (45,'Coordinate Reference System',4227,7301,'Levant',''), -(46,'Coordinate Reference System',4258,7301,'ETRF89',''), (47,'Coordinate Reference System',4272,7301,'GD49',''), (48,'Coordinate Reference System',4813,7301,'Genuk (Jakarta)',''), (49,'Datum',5104,7301,'Huang Hai 1956',''), @@ -57,7 +55,6 @@ INSERT INTO epsg_alias VALUES (55,'Datum',6218,7301,'Bogota',''), (56,'Datum',6222,7301,'South Africa',''), (57,'Datum',6227,7301,'Levant',''), -(58,'Datum',6258,7301,'European Terrestrial Reference Frame 1989',''), (59,'Datum',6269,7301,'NAD83 (1986)',''), (60,'Datum',6272,7301,'GD49',''), (61,'Datum',6308,7301,'Rikets koordinatsystem 1938',''), @@ -1234,7 +1231,6 @@ INSERT INTO epsg_alias VALUES (1250,'Coordinate Reference System',2167,7301,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 4',''), (1251,'Coordinate Reference System',4181,7301,'LUREF',''), (1252,'Coordinate Reference System',6791,7302,'NAD83(2011) / OCRS_BKF (ft)',''), -(1253,'Coordinate Reference System',4258,7301,'EUREF89',''), (1254,'Coordinate Reference System',2180,7301,'EUREF89 / CS92',''), (1255,'Coordinate Reference System',3906,7308,'HR1901',''), (1256,'Coordinate Reference System',6795,7302,'NAD83(2011) / OCRS_BRP (ft)',''), @@ -2303,14 +2299,10 @@ INSERT INTO epsg_alias VALUES (2319,'Coordinate Reference System',3148,7301,'Indian (DMA Reduced) / UTM zone 48N',''), (2320,'Coordinate Reference System',3149,7301,'Indian (DMA Reduced) / UTM zone 49N',''), (2321,'Coordinate Reference System',4930,7302,'AAD98',''), -(2322,'Coordinate Reference System',4936,7301,'ETRF89',''), -(2323,'Coordinate Reference System',4936,7301,'EUREF89',''), (2324,'Coordinate Reference System',6863,7301,'NAD83(2011) / Oregon Sweet Home-Sisters zone (ft)','Previous name.'), (2325,'Coordinate Reference System',6796,7302,'CORS96 / OCRS_BBU (m)',''), (2326,'Coordinate Reference System',4950,7301,'LKS94 (ETRS89)',''), (2327,'Coordinate Reference System',4931,7302,'AAD98',''), -(2328,'Coordinate Reference System',4937,7301,'ETRF89',''), -(2329,'Coordinate Reference System',4937,7301,'EUREF89',''), (2330,'Coordinate Reference System',4951,7301,'LKS94 (ETRS89)',''), (2331,'Coordinate Reference System',6861,7301,'NAD83(CORS96) / Oregon Sweet Home-Sisters zone (ft)','Previous name.'), (2332,'Coordinate Reference System',6860,7302,'CORS96 / OCRS_SAN (m)',''), @@ -6983,9 +6975,9 @@ INSERT INTO epsg_alias VALUES (6999,'Coordinate Reference System',7602,7302,'WISCRS Douglas (ftUS)',''), (7000,'Coordinate Reference System',7624,7302,'WISCRS Pepin-Pierce (ftUS)',''), (7001,'Coordinate Reference System',7610,7302,'WISCRS Iowa (ftUS)',''), -(7002,'Coordinate Reference System',7624,7301,'WISCRS Pepin (ftUS)',''), +(7002,'Coordinate Reference System',7624,7301,'NAD83(2011) / WISCRS Pepin (ftUS)',''), (7003,'Coordinate Reference System',7611,7302,'WISCRS Iron (ftUS)',''), -(7004,'Coordinate Reference System',7624,7301,'WISCRS Pierce (ftUS)',''), +(7004,'Coordinate Reference System',7624,7301,'NAD83(2011) / WISCRS Pierce (ftUS)',''), (7005,'Coordinate Reference System',7612,7302,'WISCRS Jackson (ftUS)',''), (7006,'Datum',1153,7302,'WGS 84 (G873)',''), (7007,'Coordinate Reference System',7625,7302,'WISCRS Polk (ftUS)',''), @@ -7121,9 +7113,11 @@ INSERT INTO epsg_alias VALUES (7139,'Coordinate_Operation',7742,7302,'Uttar Pradesh',''), (7140,'Coordinate Reference System',7791,7301,'RDN2008 / UTM zone 32N (E-N)',''), (7141,'Coordinate_Operation',7743,7302,'Uttaranchal',''), +(7142,'Coordinate_Operation',7993,7302,'ALB2020',''), (7143,'Coordinate_Operation',7744,7302,'Andaman and Nicobar',''), (7144,'Coordinate Reference System',7792,7301,'RDN2008 / TM33
svn commit: r1804432 [1/2] - /sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql
Author: desruisseaux Date: Tue Aug 8 14:56:55 2017 New Revision: 1804432 URL: http://svn.apache.org/viewvc?rev=1804432=rev Log: Upgrade EPSG geodetic dataset from version 9.0 to 9.1. Modified: sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Data.sql
svn commit: r1804429 - in /sis/trunk: ./ core/sis-raster/src/main/java/org/apache/sis/image/ storage/sis-storage/src/main/java/org/apache/sis/internal/storage/
Author: desruisseaux
Date: Tue Aug 8 14:29:32 2017
New Revision: 1804429
URL: http://svn.apache.org/viewvc?rev=1804429=rev
Log:
Merge from JDK7 branch.
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java
Propchange: sis/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 8 14:29:32 2017
@@ -1,5 +1,5 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394364-1758914
-/sis/branches/JDK7:1394913-1804411
-/sis/branches/JDK8:1584960-1804404
+/sis/branches/JDK7:1394913-1804427
+/sis/branches/JDK8:1584960-1804426
/sis/branches/JDK9:1773327-1803064
Modified:
sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java?rev=1804429=1804428=1804429=diff
==
---
sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
[UTF-8] (original)
+++
sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
[UTF-8] Tue Aug 8 14:29:32 2017
@@ -22,6 +22,8 @@ import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
+import java.awt.image.WritableRaster;
+import java.awt.image.WritableRenderedImage;
import java.util.NoSuchElementException;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.internal.jdk8.JDK8;
@@ -37,7 +39,7 @@ import static org.apache.sis.internal.jd
* left to right). Iteration can be performed on a complete image or only a
sub-region of it. Some optimized iterator
* implementations exist for a few commonly used {@linkplain
java.awt.image.SampleModel sample models}.
*
- * Usage example:
+ * Example:
* {@preformat java
* PixelIterator it = PixelIterator.create(image);
* double[] samples = null;
@@ -46,6 +48,7 @@ import static org.apache.sis.internal.jd
* // Perform computation here...
* }
* }
+ *
*
* @author Rémi Maréchal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
@@ -193,57 +196,143 @@ public abstract class PixelIterator {
}
/**
- * Creates an iterator for all pixels in the given raster.
+ * Builds pixel iterators for specified region of interest, window size or
iteration order.
+ * By default, the builder creates iterators for all pixels in the given
raster or image,
+ * with unspecified iteration order. Users can invoke setter methods for
specifying
+ * desired behavior for the iterators to create.
*
- * @param data the raster which contains the sample values on which to
iterate.
- * @return a new iterator traversing all pixels in the given raster, in
arbitrary order.
- */
-public static PixelIterator create(Raster data) {
-return create(data, null, null);
-}
+ * Example:
+ * {@preformat java
+ * PixelIterator iterator = new
PixelIterator.Builder().setRegionOfInterest(new Rectangle(10, 10, 5,
5).create(image);
+ * }
+ *
+ */
+public static class Builder {
+/**
+ * The region where to perform the iteration, or {@code null} for
iterating over all the domain.
+ */
+private Rectangle subArea;
+
+/**
+ * Size of the window to use in {@link
PixelIterator#createWindow(TransferType)} method,
+ * or {@code null} if none.
+ */
+private Dimension window;
+
+/**
+ * Creates a new iterator builder with no region of interest, no
window size and default iterator order.
+ */
+public Builder() {
+}
-/**
- * Creates an iterator for all pixels in the given image.
- *
- * @param data the image which contains the sample values on which to
iterate.
- * @return a new iterator traversing all pixels in the given image, in
arbitrary order.
- */
-public static PixelIterator create(RenderedImage data) {
-return create(data, null, null);
-}
+/**
+ * Sets the region (in pixel coordinates) where to perform the
iteration.
+ * By default, iterators will traverse all pixels in the given image
or raster.
+ *
+ * @param subArea region where to iterator, or {@code null} for
iterating over all image domain.
+ * @return {@code this} for method call chaining.
+ */
+public Builder setRegionOfInterest(final Rectangle subArea) {
+this.subArea = subArea;
+return this;
+}
-/**
- * Creates an iterator for the given
svn commit: r1804427 - in /sis/branches/JDK7: ./ core/sis-raster/src/main/java/org/apache/sis/image/ storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ storage/sis-storage/src/main/jav
Author: desruisseaux
Date: Tue Aug 8 14:19:44 2017
New Revision: 1804427
URL: http://svn.apache.org/viewvc?rev=1804427=rev
Log:
Merge from JDK8 branch.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
Propchange: sis/branches/JDK7/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 8 14:19:44 2017
@@ -1,5 +1,5 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1804404
+/sis/branches/JDK8:1584960-1804426
/sis/branches/JDK9:1773327-1803064
/sis/trunk:1394364-1508466,1519089-1519674
Modified:
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java?rev=1804427=1804426=1804427=diff
==
---
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
[UTF-8] Tue Aug 8 14:19:44 2017
@@ -22,6 +22,8 @@ import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
+import java.awt.image.WritableRaster;
+import java.awt.image.WritableRenderedImage;
import java.util.NoSuchElementException;
import org.opengis.coverage.grid.SequenceType;
import org.apache.sis.util.resources.Errors;
@@ -39,7 +41,7 @@ import static org.apache.sis.internal.jd
* left to right). Iteration can be performed on a complete image or only a
sub-region of it. Some optimized iterator
* implementations exist for a few commonly used {@linkplain
java.awt.image.SampleModel sample models}.
*
- * Usage example:
+ * Example:
* {@preformat java
* PixelIterator it = PixelIterator.create(image);
* double[] samples = null;
@@ -48,6 +50,7 @@ import static org.apache.sis.internal.jd
* // Perform computation here...
* }
* }
+ *
*
* @author Rémi Maréchal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
@@ -195,88 +198,180 @@ public abstract class PixelIterator {
}
/**
- * Creates an iterator for all pixels in the given raster.
- *
- * @param data the raster which contains the sample values on which to
iterate.
- * @return a new iterator traversing all pixels in the given raster, in
arbitrary order.
- */
-public static PixelIterator create(Raster data) {
-return create(data, null, null, null);
-}
+ * Builds pixel iterators for specified region of interest, window size or
iteration order.
+ * By default, the builder creates iterators for all pixels in the given
raster or image,
+ * with unspecified iteration order. Users can invoke setter methods for
specifying
+ * desired behavior for the iterators to create.
+ *
+ * Example:
+ * {@preformat java
+ * PixelIterator iterator = new
PixelIterator.Builder().setRegionOfInterest(new Rectangle(10, 10, 5,
5).create(image);
+ * }
+ *
+ */
+public static class Builder {
+/**
+ * The region where to perform the iteration, or {@code null} for
iterating over all the domain.
+ */
+private Rectangle subArea;
+
+/**
+ * Size of the window to use in {@link
PixelIterator#createWindow(TransferType)} method,
+ * or {@code null} if none.
+ */
+private Dimension window;
+
+/**
+ * The desired iteration order, or {@code null} for a default order.
+ */
+private SequenceType order;
+
+/**
+ * Creates a new iterator builder with no region of interest, no
window size and default iterator order.
+ */
+public Builder() {
+}
-/**
- * Creates an iterator for all pixels in the given image.
- *
- * @param data the image which contains the sample values on which to
iterate.
- * @return a new iterator traversing all pixels in the given image, in
arbitrary order.
- */
-public static PixelIterator create(RenderedImage data) {
-return create(data, null, null, null);
-}
+/**
+ * Sets the region (in pixel coordinates) where to perform the
iteration.
+ * By default, iterators will traverse all pixels in the
svn commit: r1804426 - in /sis/branches/JDK8: core/sis-raster/src/main/java/org/apache/sis/image/ storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ storage/sis-storage/src/main/java/o
Author: desruisseaux
Date: Tue Aug 8 14:13:10 2017
New Revision: 1804426
URL: http://svn.apache.org/viewvc?rev=1804426=rev
Log:
Post branch-merge cleaning. In particular, PixelIterator.create static methods
are remplaced by a Builder for making easier to handle the SequenceType case,
which can not yet be on trunk.
Modified:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
Modified:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java?rev=1804426=1804425=1804426=diff
==
---
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
[UTF-8] Tue Aug 8 14:13:10 2017
@@ -22,6 +22,8 @@ import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
+import java.awt.image.WritableRaster;
+import java.awt.image.WritableRenderedImage;
import java.util.NoSuchElementException;
import org.opengis.coverage.grid.SequenceType;
import org.apache.sis.util.resources.Errors;
@@ -38,7 +40,7 @@ import static java.lang.Math.floorDiv;
* left to right). Iteration can be performed on a complete image or only a
sub-region of it. Some optimized iterator
* implementations exist for a few commonly used {@linkplain
java.awt.image.SampleModel sample models}.
*
- * Usage example:
+ * Example:
* {@preformat java
* PixelIterator it = PixelIterator.create(image);
* double[] samples = null;
@@ -47,6 +49,7 @@ import static java.lang.Math.floorDiv;
* // Perform computation here...
* }
* }
+ *
*
* @author Rémi Maréchal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
@@ -194,88 +197,180 @@ public abstract class PixelIterator {
}
/**
- * Creates an iterator for all pixels in the given raster.
- *
- * @param data the raster which contains the sample values on which to
iterate.
- * @return a new iterator traversing all pixels in the given raster, in
arbitrary order.
- */
-public static PixelIterator create(Raster data) {
-return create(data, null, null, null);
-}
+ * Builds pixel iterators for specified region of interest, window size or
iteration order.
+ * By default, the builder creates iterators for all pixels in the given
raster or image,
+ * with unspecified iteration order. Users can invoke setter methods for
specifying
+ * desired behavior for the iterators to create.
+ *
+ * Example:
+ * {@preformat java
+ * PixelIterator iterator = new
PixelIterator.Builder().setRegionOfInterest(new Rectangle(10, 10, 5,
5).create(image);
+ * }
+ *
+ */
+public static class Builder {
+/**
+ * The region where to perform the iteration, or {@code null} for
iterating over all the domain.
+ */
+private Rectangle subArea;
+
+/**
+ * Size of the window to use in {@link
PixelIterator#createWindow(TransferType)} method,
+ * or {@code null} if none.
+ */
+private Dimension window;
+
+/**
+ * The desired iteration order, or {@code null} for a default order.
+ */
+private SequenceType order;
+
+/**
+ * Creates a new iterator builder with no region of interest, no
window size and default iterator order.
+ */
+public Builder() {
+}
-/**
- * Creates an iterator for all pixels in the given image.
- *
- * @param data the image which contains the sample values on which to
iterate.
- * @return a new iterator traversing all pixels in the given image, in
arbitrary order.
- */
-public static PixelIterator create(RenderedImage data) {
-return create(data, null, null, null);
-}
+/**
+ * Sets the region (in pixel coordinates) where to perform the
iteration.
+ * By default, iterators will traverse all pixels in the given image
or raster.
+ *
+ * @param subArea region where to iterator, or {@code null} for
iterating over all image domain.
+ * @return {@code this} for method call chaining.
+ */
+public Builder setRegionOfInterest(final Rectangle subArea) {
+
svn commit: r1804421 - /sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml~
Author: desruisseaux Date: Tue Aug 8 13:14:50 2017 New Revision: 1804421 URL: http://svn.apache.org/viewvc?rev=1804421=rev Log: Remove backup file (accidental commit). Removed: sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml~
svn commit: r1804420 [2/3] - in /sis/trunk: ./ application/sis-console/src/main/artifact/ core/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apache/sis/in
Copied: sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml~ (from r1804411, sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml) URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml%7E?p2=sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml%7E=sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml=1804411=1804420=1804420=diff == --- sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml (original) +++ sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml~ Tue Aug 8 13:13:53 2017 @@ -131,6 +131,7 @@ is divided into following sections: + @@ -151,6 +152,7 @@ is divided into following sections: + @@ -270,6 +272,7 @@ is divided into following sections: Must set src.xmlstore.dir Must set src.storage.dir Must set src.feature.dir +Must set src.raster.dir Must set src.referencing.dir Must set src.ref-by-id.dir Must set src.metadata.dir @@ -286,6 +289,7 @@ is divided into following sections: Must set test.xmlstore.dir Must set test.storage.dir Must set test.feature.dir +Must set test.raster.dir Must set test.referencing.dir Must set test.ref-by-id.dir Must set test.metadata.dir @@ -312,7 +316,7 @@ is divided into following sections: http://www.netbeans.org/ns/j2se-project/3;> - + @@ -353,7 +357,7 @@ is divided into following sections: http://www.netbeans.org/ns/j2se-project/3;> - + @@ -386,7 +390,7 @@ is divided into following sections: http://www.netbeans.org/ns/j2se-project/3;> - + @@ -500,6 +504,9 @@ is divided into following sections: + + + @@ -574,6 +581,9 @@ is divided into following sections: + + + @@ -728,6 +738,9 @@ is divided into following sections: + + + @@ -1110,7 +1123,7 @@ is divided into following sections: - + @@ -1125,6 +1138,7 @@ is divided into following sections: + @@ -1152,7 +1166,7 @@ is divided into following sections: Must select some files in the IDE or set javac.includes - + @@ -1448,6 +1462,9 @@ is divided into following sections: + + + @@ -1506,6 +1523,9 @@ is divided into following sections: + + + @@ -1549,10 +1569,10 @@ is divided into following sections: - + - + @@ -1563,6 +1583,7 @@ is divided into following sections: + @@ -1583,7 +1604,7 @@ is divided into following sections: Must select some files in the IDE or set javac.includes - + @@ -1594,6 +1615,7 @@ is divided into following sections: + Propchange: sis/trunk/ide-project/NetBeans/nbproject/cfg_hints.xml -- svn:eol-style = native Propchange: sis/trunk/ide-project/NetBeans/nbproject/cfg_hints.xml -- svn:mime-type = text/xml Modified:
svn commit: r1804420 [3/3] - in /sis/trunk: ./ application/sis-console/src/main/artifact/ core/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apache/sis/in
Modified:
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java?rev=1804420=1804419=1804420=diff
==
---
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
[UTF-8] Tue Aug 8 13:13:53 2017
@@ -224,7 +224,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.0/waypoint.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_0, reader.getVersion());
-try (Stream features = reader.features(false)) {
+try (Stream features = reader.features()) {
final Iterator it = features.iterator();
verifyPoint(it.next(), 0, false);
verifyPoint(it.next(), 1, false);
@@ -245,7 +245,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.1/waypoint.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_1, reader.getVersion());
-try (Stream features = reader.features(false)) {
+try (Stream features = reader.features()) {
final Iterator it = features.iterator();
verifyPoint(it.next(), 0, true);
verifyPoint(it.next(), 1, true);
@@ -266,7 +266,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.0/route.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_0, reader.getVersion());
-try (Stream features = reader.features(false)) {
+try (Stream features = reader.features()) {
final Iterator it = features.iterator();
verifyRoute(it.next(), false, 1);
verifyEmpty(it.next(), "rtept");
@@ -295,7 +295,7 @@ public final strictfp class ReaderTest e
* This verification is shared by {@link #testRoute110()} and {@link
#testSequentialReads()}.
*/
static void verifyRoute110(final Store reader) throws DataStoreException {
-try (Stream features = reader.features(false)) {
+try (Stream features = reader.features()) {
final Iterator it = features.iterator();
verifyRoute(it.next(), true, 3);
verifyEmpty(it.next(), "rtept");
@@ -373,7 +373,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.0/track.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_0, reader.getVersion());
-try (Stream features = reader.features(false)) {
+try (Stream features = reader.features()) {
final Iterator it = features.iterator();
verifyTrack(it.next(), false, 1);
verifyEmpty(it.next(), "trkseg");
@@ -393,7 +393,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.1/track.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_1, reader.getVersion());
-try (Stream features = reader.features(false)) {
+try (Stream features = reader.features()) {
final Iterator it = features.iterator();
verifyTrack(it.next(), true, 3);
verifyEmpty(it.next(), "trkseg");
@@ -610,13 +610,13 @@ public final strictfp class ReaderTest e
@DependsOnMethod("testSequentialReads")
public void testConcurrentReads() throws DataStoreException {
try (Store reader = createFromURL()) {
-final Stream f1 = reader.features(false);
+final Stream f1 = reader.features();
final Iterator i1 = f1.iterator();
verifyRoute(i1.next(), true, 3);
-final Stream f2 = reader.features(false);
+final Stream f2 = reader.features();
final Iterator i2 = f2.iterator();
verifyEmpty(i1.next(), "rtept");
-final Stream f3 = reader.features(false);
+final Stream f3 = reader.features();
final Iterator i3 = f3.iterator();
verifyRoute(i2.next(), true, 3);
verifyRoute(i3.next(), true, 3);
svn commit: r1804420 [1/3] - in /sis/trunk: ./ application/sis-console/src/main/artifact/ core/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apache/sis/in
Author: desruisseaux Date: Tue Aug 8 13:13:53 2017 New Revision: 1804420 URL: http://svn.apache.org/viewvc?rev=1804420=rev Log: Merge from JDK7 branch. Added: sis/trunk/core/sis-raster/ - copied from r1804411, sis/branches/JDK7/core/sis-raster/ sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml~ - copied, changed from r1804411, sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractFeatureSet.java - copied unchanged from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractFeatureSet.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureAccess.java - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureAccess.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java - copied unchanged from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/FeatureAccess.java - copied, changed from r1804411, sis/branches/JDK7/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/FeatureAccess.java Removed: sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/FeatureStore.java Modified: sis/trunk/ (props changed) sis/trunk/README sis/trunk/application/sis-console/src/main/artifact/README sis/trunk/core/pom.xml sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java sis/trunk/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java sis/trunk/ide-project/NetBeans/build.xml sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml sis/trunk/ide-project/NetBeans/nbproject/cfg_hints.xml (props changed) sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties
svn commit: r1804411 [2/2] - in /sis/branches/JDK7: ./ application/sis-console/src/main/artifact/ core/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apach
Modified:
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java?rev=1804411=1804410=1804411=diff
==
---
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] Tue Aug 8 12:43:28 2017
@@ -26,6 +26,7 @@ import org.apache.sis.storage.StorageCon
import org.apache.sis.internal.netcdf.Decoder;
import org.apache.sis.metadata.ModifiableMetadata;
import org.apache.sis.setup.OptionKey;
+import org.apache.sis.storage.Resource;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Version;
import ucar.nc2.constants.CDM;
@@ -117,6 +118,17 @@ public class NetcdfStore extends DataSto
}
/**
+ * This implementation does not provide any resource yet.
+ *
+ * @return currently {@code null} (will be implemented in future Apache
SIS version).
+ * @throws DataStoreException if an error occurred while reading the data.
+ */
+@Override
+public Resource getRootResource() throws DataStoreException {
+return null;
+}
+
+/**
* Returns the version number of the Climate and Forecast (CF) conventions
used in the NetCDF file.
* The use of CF convention is mandated by the OGC 11-165r2 standard
* (CF-netCDF3 Data Model Extension standard).
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/FeatureCatalogBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/FeatureCatalogBuilder.java?rev=1804411=1804410=1804411=diff
==
---
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/FeatureCatalogBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/FeatureCatalogBuilder.java
[UTF-8] Tue Aug 8 12:43:28 2017
@@ -39,7 +39,7 @@ import org.opengis.feature.FeatureType;
* @since 0.8
* @module
*/
-public class FeatureCatalogBuilder extends MetadataBuilder {
+public final class FeatureCatalogBuilder extends MetadataBuilder {
/**
* The data store for which the metadata will be created, or {@code null}
if unknown.
* This is used for producing error message if an exception is thrown.
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java?rev=1804411=1804410=1804411=diff
==
---
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] Tue Aug 8 12:43:28 2017
@@ -52,8 +52,8 @@ import org.opengis.metadata.identificati
import org.opengis.metadata.distribution.Format;
import org.opengis.metadata.quality.Element;
import org.opengis.geometry.DirectPosition;
+import org.opengis.referencing.ReferenceSystem;
import org.opengis.referencing.crs.VerticalCRS;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.metadata.iso.DefaultMetadata;
@@ -123,7 +123,7 @@ import org.opengis.metadata.citation.Res
* API of this class may change in any future SIS versions.
*
* @author Martin Desruisseaux (Geomatys)
- * @author Rémi Marechal (Geomatys)
+ * @author Rémi Maréchal (Geomatys)
* @version 0.8
* @since 0.8
* @module
@@ -1611,7 +1611,7 @@ parse: for (int i = 0; i < length;)
*
* @param crs the coordinate reference system to add to the metadata, or
{@code null} for no-operation.
*/
-public final void addReferenceSystem(final CoordinateReferenceSystem crs) {
+public final void addReferenceSystem(final ReferenceSystem crs) {
if (crs != null) {
addIfNotPresent(metadata().getReferenceSystemInfo(), crs);
}
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.java?rev=1804411=1804410=1804411=diff
==
---
svn commit: r1804411 [1/2] - in /sis/branches/JDK7: ./ application/sis-console/src/main/artifact/ core/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apach
Author: desruisseaux Date: Tue Aug 8 12:43:28 2017 New Revision: 1804411 URL: http://svn.apache.org/viewvc?rev=1804411=rev Log: Merge from JDK8 branch. Added: sis/branches/JDK7/core/sis-raster/ - copied from r1804404, sis/branches/JDK8/core/sis-raster/ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractFeatureSet.java - copied unchanged from r1804404, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractFeatureSet.java sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java - copied unchanged from r1804404, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureAccess.java - copied, changed from r1804404, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureAccess.java sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java - copied unchanged from r1804404, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java - copied unchanged from r1804404, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java - copied, changed from r1804404, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java - copied unchanged from r1804404, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java sis/branches/JDK7/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/FeatureAccess.java - copied, changed from r1804404, sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/FeatureAccess.java Removed: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/FeatureStore.java Modified: sis/branches/JDK7/ (props changed) sis/branches/JDK7/README sis/branches/JDK7/application/sis-console/src/main/artifact/README sis/branches/JDK7/core/pom.xml sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java sis/branches/JDK7/core/sis-raster/pom.xml sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java sis/branches/JDK7/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java sis/branches/JDK7/ide-project/NetBeans/build.xml sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml sis/branches/JDK7/ide-project/NetBeans/nbproject/cfg_hints.xml (props changed) sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
svn commit: r1804404 - /sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
Author: desruisseaux
Date: Tue Aug 8 12:00:10 2017
New Revision: 1804404
URL: http://svn.apache.org/viewvc?rev=1804404=rev
Log:
Format "+towgs84" parameter in Proj.4 string.
Modified:
sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
Modified:
sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java?rev=1804404=1804403=1804404=diff
==
---
sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
[UTF-8] Tue Aug 8 12:00:10 2017
@@ -42,7 +42,10 @@ import org.opengis.referencing.operation
import org.apache.sis.referencing.operation.AbstractCoordinateOperation;
import org.apache.sis.referencing.factory.UnavailableFactoryException;
import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
+import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
+import org.apache.sis.referencing.datum.BursaWolfParameters;
import org.apache.sis.referencing.IdentifiedObjects;
+import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.CRS;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.internal.metadata.AxisDirections;
@@ -51,6 +54,7 @@ import org.apache.sis.internal.system.OS
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.ArgumentChecks;
+import org.apache.sis.util.Utilities;
import org.apache.sis.util.Static;
import org.apache.sis.util.iso.Types;
import org.apache.sis.measure.Units;
@@ -255,7 +259,23 @@ public final class Proj4 extends Static
definition.append("to_meter=").append(Units.toStandardUnit(unit));
}
}
+/*
+ * Append the "+towgs84" element if any. This is the last piece of
information.
+ * Note that the use of a "+towgs84" parameter is an "early binding"
approach,
+ * which is usually not recommended. But Proj4 works that way.
+ */
if (validCS) {
+if (datum instanceof DefaultGeodeticDatum) {
+for (final BursaWolfParameters bwp : ((DefaultGeodeticDatum)
datum).getBursaWolfParameters()) {
+if
(Utilities.equalsIgnoreMetadata(CommonCRS.WGS84.datum(), bwp.getTargetDatum()))
{
+definition.append("
+towgs84=").append(bwp.tX).append(',').append(bwp.tY).append(',').append(bwp.tZ);
+if (!bwp.isTranslation()) {
+
definition.append(',').append(bwp.rX).append(',').append(bwp.rY).append(',').append(bwp.rZ).append(',').append(bwp.dS);
+}
+break;
+}
+}
+}
return definition.toString();
}
/*
svn commit: r1804399 - in /sis/branches/JDK8/core/sis-raster/src: main/java/org/apache/sis/image/ test/java/org/apache/sis/image/ test/java/org/apache/sis/test/suite/
Author: desruisseaux
Date: Tue Aug 8 11:15:52 2017
New Revision: 1804399
URL: http://svn.apache.org/viewvc?rev=1804399=rev
Log:
Add tests for WritablePixelIterator.
Added:
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
- copied, changed from r1804398,
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/PixelIteratorTest.java
Removed:
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/PixelIteratorTest.java
Modified:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/TiledImage.java
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/test/suite/RasterTestSuite.java
Modified:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java?rev=1804399=1804398=1804399=diff
==
---
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
[UTF-8] Tue Aug 8 11:15:52 2017
@@ -279,6 +279,18 @@ public abstract class PixelIterator {
}
/**
+ * Returns {@code true} if this iterator can write pixel values (after
cast to {@code WritablePixelIterator}).
+ * This method should be used instead than {@code instanceof} check
because, for some implementations, being
+ * an instance of {@code WritablePixelIterator} is not a sufficient
condition.
+ *
+ * @return {@code true} if this iterator can safely be casted to {@link
WritablePixelIterator} and used for
+ * writing pixel values.
+ */
+public boolean isWritable() {
+return false;
+}
+
+/**
* Returns the most efficient type ({@code int}, {@code float} or {@code
double}) for transferring data between the
* underlying rasters and this iterator. The transfer type is not
necessarily the storage type used by the rasters.
* For example {@code int} values will be used for transferring data even
if the underlying rasters store all sample
Modified:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java?rev=1804399=1804398=1804399=diff
==
---
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
[UTF-8] Tue Aug 8 11:15:52 2017
@@ -32,9 +32,11 @@ import org.apache.sis.util.ArgumentCheck
/**
* A pixel iterator capable to write sample values. This iterator can edit
pixel values in place,
* or write values in a different destination image than the source image.
Source and destination
- * images must use the same sample model,
+ * images must use the same sample model and the same coordinates (both for
pixels and tiles).
+ *
+ * Contrarily to {@code PixelIterator}, {@code WritablePixelIterator} needs
to be closed after
+ * iteration in order to release tiles. Example:
*
- * Usage example:
* {@preformat java
* try (WritablePixelIterator it = WritablePixelIterator.create(image)) {
* double[] samples = null;
@@ -46,6 +48,10 @@ import org.apache.sis.util.ArgumentCheck
* }
* }
*
+ * Casting a {@code PixelIterator}
+ * To check if a {@code PixelIterator} can be used for writing pixels, a
{@code … instanceof WritablePixelIterator}
+ * check is not sufficient. The {@link PixelIterator#isWritable()} method
should be invoked instead.
+ *
* @author Rémi Maréchal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
@@ -213,6 +219,19 @@ public abstract class WritablePixelItera
}
/**
+ * Returns {@code true} if this iterator can write pixel values.
+ * This method should be used instead than {@code instanceof} check
because, for some implementations, being an
+ * instance of {@code WritablePixelIterator} is not a sufficient
condition. However this method is guaranteed to
+ * return {@code true} for any iterator created by {@code
WritablePixelIterator.create(…)} methods.
+ *
+ * @return {@code true} if this iterator can be used for writing pixel
values.
+ */
+@Override
+public boolean isWritable() {
+return (destination != null) || (destRaster != null);
+}
+
+/**
* Writes a
[jira] [Comment Edited] (SIS-356) NetCDF reader should recognize Earth Observation metadata
[
https://issues.apache.org/jira/browse/SIS-356?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16118055#comment-16118055
]
kenneth mcfarland edited comment on SIS-356 at 8/8/17 8:47 AM:
---
I am interested in working on this issue. This sounds very interesting and I'd
love to have a shot at it.
was (Author: kpm1985):
I am interested on working on this issue. This sounds very interesting and I'd
love to have a shot at it.
> NetCDF reader should recognize Earth Observation metadata
> -
>
> Key: SIS-356
> URL: https://issues.apache.org/jira/browse/SIS-356
> Project: Spatial Information Systems
> Issue Type: Task
> Components: Storage
>Affects Versions: 0.7
>Reporter: Martin Desruisseaux
>Priority: Minor
>
> The European Space Agency (ESA) published an extension to CF-Convention for
> Earth Observation (EO) Metadata. This extension would fit nicely in SIS by
> completing the
> [AttributeNames|http://sis.apache.org/apidocs/org/apache/sis/storage/netcdf/AttributeNames.html]
> class, which defines the mapping from NetCDF attributes to ISO 19115
> metadata. The process would be:
> * Get the [NetCDF Earth Observation (EO) Metadata
> Conventions|https://wiki.services.eoportal.org/tiki-download_wiki_attachment.php?attId=3271=y]
> document (version 1.1.0 published in 2014-03-11). Authors are from CNR -
> Institute of Atmospheric Pollution Research.
> * Inspect the NetCDF attributes listed in table and establish a relationship
> with an equivalent ISO 19115 attribute when possible. Not all attributes have
> equivalence; it is okay to leave attributes unmapped.
> * For each mapped attribute, add a constant in Apache SIS {{AttributeNames}}
> class.
> * Edit the {{MetadataReader}} class for using those new constants.
> * Add JUnit tests.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
[jira] [Commented] (SIS-356) NetCDF reader should recognize Earth Observation metadata
[
https://issues.apache.org/jira/browse/SIS-356?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16118055#comment-16118055
]
kenneth mcfarland commented on SIS-356:
---
I am interested on working on this issue. This sounds very interesting and I'd
love to have a shot at it.
> NetCDF reader should recognize Earth Observation metadata
> -
>
> Key: SIS-356
> URL: https://issues.apache.org/jira/browse/SIS-356
> Project: Spatial Information Systems
> Issue Type: Task
> Components: Storage
>Affects Versions: 0.7
>Reporter: Martin Desruisseaux
>Priority: Minor
>
> The European Space Agency (ESA) published an extension to CF-Convention for
> Earth Observation (EO) Metadata. This extension would fit nicely in SIS by
> completing the
> [AttributeNames|http://sis.apache.org/apidocs/org/apache/sis/storage/netcdf/AttributeNames.html]
> class, which defines the mapping from NetCDF attributes to ISO 19115
> metadata. The process would be:
> * Get the [NetCDF Earth Observation (EO) Metadata
> Conventions|https://wiki.services.eoportal.org/tiki-download_wiki_attachment.php?attId=3271=y]
> document (version 1.1.0 published in 2014-03-11). Authors are from CNR -
> Institute of Atmospheric Pollution Research.
> * Inspect the NetCDF attributes listed in table and establish a relationship
> with an equivalent ISO 19115 attribute when possible. Not all attributes have
> equivalence; it is okay to leave attributes unmapped.
> * For each mapped attribute, add a constant in Apache SIS {{AttributeNames}}
> class.
> * Edit the {{MetadataReader}} class for using those new constants.
> * Add JUnit tests.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
