Skip to content

Commit

Permalink
Updated geopacklage output extension
Browse files Browse the repository at this point in the history
woutergd committed Oct 18, 2024
1 parent c383efd commit 50c5c72
Showing 12 changed files with 92 additions and 5 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -54,6 +54,7 @@ Only a curated list of the [vast amount](http://geoserver.org/release/stable/) o
- vectortiles
- flatgeobuf
- dxf
- geopkg-output
- cog
- importer
- imagepyramid
2 changes: 1 addition & 1 deletion compose/compose.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ volumes:
driver_opts:
type: none
o: bind
device: $PWD/../config
device: C:\\temp\\config
driver: local

x-gs-dependencies: &gs-dependencies
2 changes: 1 addition & 1 deletion config
Submodule config updated 1 files
+0 −3 geoserver_logging.yml
14 changes: 14 additions & 0 deletions src/apps/geoserver/webui/pom.xml
Original file line number Diff line number Diff line change
@@ -120,6 +120,20 @@
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-dxf-wps</artifactId>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-geopkg-output</artifactId>
<exclusions>
<exclusion>
<groupId>org.geoserver</groupId>
<artifactId>gs-wms</artifactId>
</exclusion>
<exclusion>
<groupId>org.geoserver</groupId>
<artifactId>gs-gwc</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.geoserver</groupId>
<artifactId>gs-wms</artifactId>
Original file line number Diff line number Diff line change
@@ -15,7 +15,8 @@
"jar:gs-web-wfs-.*!/applicationContext.xml", //
"jar:gs-wfs-.*!/applicationContext.xml",
"jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*",
"jar:gs-dxf-core-.*!/applicationContext.xml#name=.*"
"jar:gs-dxf-core-.*!/applicationContext.xml#name=.*",
"jar:gs-geopkg-output-.*!/applicationContext.xml#name=.*"
} //
)
public class WfsConfiguration {}
14 changes: 14 additions & 0 deletions src/apps/geoserver/wfs/pom.xml
Original file line number Diff line number Diff line change
@@ -34,6 +34,20 @@
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-dxf-core</artifactId>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-geopkg-output</artifactId>
<exclusions>
<exclusion>
<groupId>org.geoserver</groupId>
<artifactId>gs-wms</artifactId>
</exclusion>
<exclusion>
<groupId>org.geoserver</groupId>
<artifactId>gs-gwc</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@
locations = {
"jar:gs-wfs-.*!/applicationContext.xml#name=.*",
"jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*",
"jar:gs-dxf-core-.*!/applicationContext.xml#name=.*"
"jar:gs-dxf-core-.*!/applicationContext.xml#name=.*",
"jar:gs-geopkg-output-.*!/applicationContext.xml#name=.*"
} //
)
public class WfsAutoConfiguration {
5 changes: 5 additions & 0 deletions src/pom.xml
Original file line number Diff line number Diff line change
@@ -597,6 +597,11 @@
<artifactId>gs-dxf-wps</artifactId>
<version>${gs.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-geopkg-output</artifactId>
<version>${gs.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-web-resource</artifactId>
10 changes: 10 additions & 0 deletions src/starters/wms-extensions/pom.xml
Original file line number Diff line number Diff line change
@@ -32,6 +32,16 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-geopkg-output</artifactId>
<exclusions>
<exclusion>
<groupId>org.geoserver</groupId>
<artifactId>gs-wfs</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-vectortiles</artifactId>
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* (c) 2021 Open Source Geospatial Foundation - all rights reserved This code is licensed under the
* GPL 2.0 license, available at the root application directory.
*/
package org.geoserver.cloud.autoconfigure.wms.extensions;

import org.geoserver.cloud.autoconfigure.wms.extensions.WmsExtensionsConfigProperties.Wms.WmsOutputFormatsConfigProperties.VectorTilesConfigProperties;
import org.geoserver.cloud.config.factory.FilteringXmlBeanDefinitionReader;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;

/**
* @since 1.0
*/
@Configuration
@EnableConfigurationProperties(WmsExtensionsConfigProperties.class)
@ImportResource( //
reader = FilteringXmlBeanDefinitionReader.class, //
locations = {"jar:gs-geopkg-output-.*!/applicationContext.xml"})
class GeoPkgOutputConfiguration {

@ConditionalOnProperty(
name = "geoserver.wms.output-formats.geopkg.enabled",
havingValue = "true",
matchIfMissing = true)
@ImportResource( //
reader = FilteringXmlBeanDefinitionReader.class, //
locations = {
"jar:gs-geopkg-output-.*!/applicationContext.xml"
})
static class Enabled {}
}
Original file line number Diff line number Diff line change
@@ -22,7 +22,8 @@
value = {
CssStylingConfiguration.class,
MapBoxStylingConfiguration.class,
VectorTilesConfiguration.class
VectorTilesConfiguration.class,
GeoPkgOutputConfiguration.class
})
public class WmsExtensionsAutoConfiguration {
public @PostConstruct void log() {
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@
* mapbox.enabled: true
* wms:
* outputFormats:
* geopkg.enabled: true
* vectorTiles:
* mapbox.enabled: true
* geojson.enabled: true
@@ -50,6 +51,9 @@
new WmsOutputFormatsConfigProperties();

public static @Data class WmsOutputFormatsConfigProperties {

private EnabledProperty geopkg = new EnabledProperty();

private VectorTilesConfigProperties vectorTiles = new VectorTilesConfigProperties();

public static @Data class VectorTilesConfigProperties {

0 comments on commit 50c5c72

Please sign in to comment.