Skip to content

Commit

Permalink
GeoServer: updated GeoServer to 2.26.0, added descriptions to parking…
Browse files Browse the repository at this point in the history 
… sites attributes and updated sharing stations style
  • Loading branch information
@richardforsterNVBW
richardforsterNVBW committed Oct 4, 2024
1 parent 683d077 commit 0cec88f
Show file tree
Hide file tree
Showing 7 changed files with 385 additions and 72 deletions.
4 changes: 2 additions & 2 deletions .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ IPL_GTFS_API_DOCS_PORT=4001
GEOSERVER_PROXY_BASE_URL=http://localhost:8600/geoserver
GEOSERVER_CSRF_WHITELIST=mobidata-bw.de
# NOTE: When bumping GEOSERVER_IMAGE, mind to bump the GEOSERVER_PLUGIN_DYNAMIC_URLS accordingly
GEOSERVER_IMAGE=geosolutionsit/geoserver:2.25.3
GEOSERVER_PLUGIN_DYNAMIC_URLS=https://sourceforge.net/projects/geoserver/files/GeoServer/2.25.3/extensions/geoserver-2.25.3-vectortiles-plugin.zip https://sourceforge.net/projects/geoserver/files/GeoServer/2.25.3/extensions/geoserver-2.25.3-inspire-plugin.zip
GEOSERVER_IMAGE=geosolutionsit/geoserver:2.26.0
GEOSERVER_PLUGIN_DYNAMIC_URLS=https://sourceforge.net/projects/geoserver/files/GeoServer/2.26.0/extensions/geoserver-2.26.0-vectortiles-plugin.zip https://sourceforge.net/projects/geoserver/files/GeoServer/2.26.0/extensions/geoserver-2.26.0-inspire-plugin.zip
GEOSERVER_PORT=8600
GEOSERVER_INITIAL_MEMORY=512M
GEOSERVER_MAXIMUM_MEMORY=4G
Expand Down
123 changes: 104 additions & 19 deletions etc/geoserver/workspaces/MobiData-BW/park-api-db/parking_sites_bicycle/featuretype.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<entry key="JDBC_VIRTUAL_TABLE">
<virtualTable>
<name>parking_sites_bicycle</name>
<sql>SELECT id, source_id, original_uid, purpose, name, operator_name, public_url, photo_url, address, description, type, max_stay, has_lighting, fee_description, has_fee, park_and_ride_type, has_realtime_data, realtime_opening_status, lat, lon, capacity, realtime_capacity, realtime_free_capacity, capacity_charging, realtime_capacity_charging, realtime_free_capacity_charging, opening_hours, is_covered, supervision_type, related_location, geometry, created_at, modified_at, static_data_updated_at, realtime_data_updated_at FROM parking_site&#xd;
<sql>SELECT id, source_id, original_uid, purpose, name, operator_name, public_url, photo_url, address, description, type, max_stay, has_lighting, fee_description, has_fee, park_and_ride_type, has_realtime_data, realtime_opening_status, capacity, realtime_capacity, realtime_free_capacity, capacity_charging, realtime_capacity_charging, realtime_free_capacity_charging, opening_hours, is_covered, supervision_type, related_location, geometry, created_at, modified_at, static_data_updated_at, realtime_data_updated_at FROM parking_site&#xd;
WHERE purpose=&apos;BIKE&apos;
</sql>
<escapeSql>false</escapeSql>
Expand Down Expand Up @@ -84,247 +84,332 @@ WHERE purpose=&apos;BIKE&apos;
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.lang.Long</binding>
<description>
<en-US>ID der Parkanlage (von parkAPI erzeugt)</en-US>
</description>
</attribute>
<attribute>
<name>source_id</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.lang.Long</binding>
<description>
<en-US>ID des Datengebers (von parkAPI erzeugt)</en-US>
</description>
</attribute>
<attribute>
<name>original_uid</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Ursprüngliche ID der Parkanlage beim Datengeber</en-US>
</description>
</attribute>
<attribute>
<name>purpose</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Zweck der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>name</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Name der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>operator_name</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Betreiber der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>public_url</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Link zu weiterführenden Informationen der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>photo_url</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Link zu einem Foto der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>address</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Adresse der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>description</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Beschreibung</en-US>
</description>
</attribute>
<attribute>
<name>type</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Art der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>max_stay</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.Integer</binding>
<description>
<en-US>Maximale Parkdauer</en-US>
</description>
</attribute>
<attribute>
<name>has_lighting</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.Boolean</binding>
<description>
<en-US>Beleuchtung?</en-US>
</description>
</attribute>
<attribute>
<name>fee_description</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Beschreibung der Gebühren</en-US>
</description>
</attribute>
<attribute>
<name>has_fee</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.Boolean</binding>
<description>
<en-US>Gebührenpflichtig?</en-US>
</description>
</attribute>
<attribute>
<name>park_and_ride_type</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Art der B+R-Anlage</en-US>
</description>
</attribute>
<attribute>
<name>has_realtime_data</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.lang.Boolean</binding>
<description>
<en-US>Echtzeitdaten?</en-US>
</description>
</attribute>
<attribute>
<name>realtime_opening_status</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.lang.String</binding>
</attribute>
<attribute>
<name>lat</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.math.BigDecimal</binding>
</attribute>
<attribute>
<name>lon</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.math.BigDecimal</binding>
<description>
<en-US>Echtzeit-Status der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>capacity</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.lang.Integer</binding>
<description>
<en-US>Anzahl Stellplätze</en-US>
</description>
</attribute>
<attribute>
<name>realtime_capacity</name>
<name>capacity_charging</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.Integer</binding>
<description>
<en-US>Anzahl Stellplätze mit Lademöglichkeit</en-US>
</description>
</attribute>
<attribute>
<name>realtime_free_capacity</name>
<name>realtime_capacity</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.Integer</binding>
<description>
<en-US>Anzahl Stellplätze (Echtzeit)</en-US>
</description>
</attribute>
<attribute>
<name>capacity_charging</name>
<name>realtime_free_capacity</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.Integer</binding>
<description>
<en-US>Anzahl freier Stellplätze (Echtzeit)</en-US>
</description>
</attribute>
<attribute>
<name>realtime_capacity_charging</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.Integer</binding>
<description>
<en-US>Anzahl Stellplätze mit Lademöglichkeit (Echtzeit)</en-US>
</description>
</attribute>
<attribute>
<name>realtime_free_capacity_charging</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.Integer</binding>
<description>
<en-US>Anzahl freier Stellplätze mit Lademöglichkeit (Echtzeit)</en-US>
</description>
</attribute>
<attribute>
<name>opening_hours</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Öffnungszeiten</en-US>
</description>
</attribute>
<attribute>
<name>is_covered</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.Boolean</binding>
<description>
<en-US>Überdacht?</en-US>
</description>
</attribute>
<attribute>
<name>supervision_type</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Art der Überwachung</en-US>
</description>
</attribute>
<attribute>
<name>related_location</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.lang.String</binding>
<description>
<en-US>Ortsbezug der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>geometry</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>org.locationtech.jts.geom.Point</binding>
<description>
<en-US>Koordinate der Parkanlage</en-US>
</description>
</attribute>
<attribute>
<name>created_at</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.sql.Timestamp</binding>
<description>
<en-US>Erstellungsdatum in der parkAPI</en-US>
</description>
</attribute>
<attribute>
<name>modified_at</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.sql.Timestamp</binding>
<description>
<en-US>Zeitpunkt der letzten Änderung in der parkAPI</en-US>
</description>
</attribute>
<attribute>
<name>static_data_updated_at</name>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>false</nillable>
<binding>java.sql.Timestamp</binding>
<description>
<en-US>Letzter Aktualisierungszeitpunkt der statischen Daten</en-US>
</description>
</attribute>
<attribute>
<name>realtime_data_updated_at</name>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
<nillable>true</nillable>
<binding>java.sql.Timestamp</binding>
<description>
<en-US>Letzter Aktualisierungszeitpunkt der Echtzeitdaten</en-US>
</description>
</attribute>
</attributes>
<overridingServiceSRS>false</overridingServiceSRS>
<skipNumberMatched>false</skipNumberMatched>
<circularArcPresent>false</circularArcPresent>
</featureType>
</featureType>
2 changes: 1 addition & 1 deletion etc/geoserver/workspaces/MobiData-BW/park-api-db/parking_sites_bicycle/layer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
<logoHeight>0</logoHeight>
</attribution>
<dateCreated>2024-05-06 13:29:29.385 UTC</dateCreated>
<dateModified>2024-09-26 13:10:17.22 UTC</dateModified>
<dateModified>2024-10-04 09:01:04.906 UTC</dateModified>
</layer>
Loading

0 comments on commit 0cec88f

Please sign in to comment.