You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by js...@apache.org on 2025/01/10 14:33:15 UTC
(sis) branch geoapi-4.0 updated (4006d7b477 -> b294df8a45)
This is an automated email from the ASF dual-hosted git repository.
jsorel pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
from 4006d7b477 Fix a NullPointerException in portrayal (incubator).
new 387c4e1001 Fix shapefile record reader not skipping trailing bytes
new b294df8a45 Add style painter declaration in META-INF
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../META-INF/services/org.apache.sis.map.service.StylePainter | 3 ++-
.../org.apache.sis.map.service.se1.SymbolizerToScene2D$Spi | 9 +++++++++
.../main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java | 6 ++----
3 files changed, 13 insertions(+), 5 deletions(-)
copy endorsed/src/org.apache.sis.cloud.aws/main/META-INF/services/java.nio.file.spi.FileSystemProvider => incubator/src/org.apache.sis.portrayal.map/main/META-INF/services/org.apache.sis.map.service.StylePainter (84%)
create mode 100644 incubator/src/org.apache.sis.portrayal.map/main/META-INF/services/org.apache.sis.map.service.se1.SymbolizerToScene2D$Spi
(sis) 01/02: Fix shapefile record reader not skipping trailing bytes
Posted by js...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jsorel pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 387c4e100190f1bd32d0ea5200f1a45067d7ff5f
Author: jsorel <jo...@geomatys.com>
AuthorDate: Fri Jan 10 15:32:26 2025 +0100
Fix shapefile record reader not skipping trailing bytes
---
.../main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java
index a0cdad14aa..620ebbbfc2 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java
@@ -82,10 +82,8 @@ public final class ShapeRecord {
channel.buffer.order(ByteOrder.LITTLE_ENDIAN);
final int shapeType = channel.readInt();
final boolean match = io.decode(channel,this, filter);
- if (!match) {
- //move to record end
- channel.seek(position + byteSize);
- }
+ //always move to record end, size is sometime larger then the geometry bytes
+ channel.seek(position + byteSize);
return match;
}
(sis) 02/02: Add style painter declaration in META-INF
Posted by js...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jsorel pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit b294df8a45c97418de4c1e7181d61a623d695c76
Author: jsorel <jo...@geomatys.com>
AuthorDate: Fri Jan 10 15:32:57 2025 +0100
Add style painter declaration in META-INF
---
.../META-INF/services/org.apache.sis.map.service.StylePainter | 5 +++++
.../org.apache.sis.map.service.se1.SymbolizerToScene2D$Spi | 9 +++++++++
2 files changed, 14 insertions(+)
diff --git a/incubator/src/org.apache.sis.portrayal.map/main/META-INF/services/org.apache.sis.map.service.StylePainter b/incubator/src/org.apache.sis.portrayal.map/main/META-INF/services/org.apache.sis.map.service.StylePainter
new file mode 100644
index 0000000000..40215bfd55
--- /dev/null
+++ b/incubator/src/org.apache.sis.portrayal.map/main/META-INF/services/org.apache.sis.map.service.StylePainter
@@ -0,0 +1,5 @@
+# Workaround for Maven bug https://issues.apache.org/jira/browse/MNG-7855
+# The content of this file is automatically derived from module-info.class file.
+# Should be used only if the JAR file was on class-path rather than module-path.
+org.apache.sis.map.service.se1.SEPainter
+
diff --git a/incubator/src/org.apache.sis.portrayal.map/main/META-INF/services/org.apache.sis.map.service.se1.SymbolizerToScene2D$Spi b/incubator/src/org.apache.sis.portrayal.map/main/META-INF/services/org.apache.sis.map.service.se1.SymbolizerToScene2D$Spi
new file mode 100644
index 0000000000..9ccdc25a33
--- /dev/null
+++ b/incubator/src/org.apache.sis.portrayal.map/main/META-INF/services/org.apache.sis.map.service.se1.SymbolizerToScene2D$Spi
@@ -0,0 +1,9 @@
+# Workaround for Maven bug https://issues.apache.org/jira/browse/MNG-7855
+# The content of this file is automatically derived from module-info.class file.
+# Should be used only if the JAR file was on class-path rather than module-path.
+org.apache.sis.map.service.se1.PointToScene2D$Spi
+org.apache.sis.map.service.se1.LineToScene2D$Spi
+org.apache.sis.map.service.se1.PolygonToScene2D$Spi
+org.apache.sis.map.service.se1.TextToScene2D$Spi
+org.apache.sis.map.service.se1.RasterToScene2D$Spi
+