Skip to content
Snippets Groups Projects
Commit 54a60bff authored by User expired's avatar User expired
Browse files

fixed geoserver installation icons/styles

parent 07217206
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 249 additions and 24 deletions
CHANGELOG.md
+ 1
− 0
View file @ 54a60bff
Upcoming version:
-----------------
- fixed geoserver installation icons/styles (Nikolaus Krismer)
- gradle wrapper update to version 2.13 (Nikolaus Krismer)
Version v0.6.1:
......
bootstrap/importData.sh
+ 4
− 4
View file @ 54a60bff
......@@ -109,7 +109,7 @@ function fn_import_dataset_neo4j_spatial() {
# We copy data from postgis for specified dataset (after postgis data import)
${EXEC_JAVA} -cp ${DEPLOY_DIR}/isochrone-tools.jar at.uibk.dbis.isochrone.exporter.ImportDataNeo4j -t "${CITY}" > "$WORKING_DIR/import_neo4j_$CITY.log" 2>&1
if [ $? -ne 0 ]; then
fn_echo "An error occurred while importing data into neo4j using isochrone-tools. The process will exit now with status $?" "ERROR"
fn_echo "An error occurred while importing data into neo4j using isochrone-tools. The process will exit now with status $?" "ERROR"
exit $?
fi
}
......@@ -249,14 +249,14 @@ function fn_import_spatialite() {
fn_download_newer $DOWNLOAD_DIR/$SPATIALITE_FILENAME "${CACHE_DIR_REMOTE}${SPATIALITE_FILENAME}"
cp -f "$DOWNLOAD_DIR/$SPATIALITE_FILENAME" "$DATA_DIR/"
fi
if $UPDATE_DATA && [ -f "$DATA_DIR/$SPATIALITE_FILENAME" ]; then
fn_echo "Deleting outdated spatialite database (forced data update)"
rm -rf "$DATA_DIR/$SPATIALITE_FILENAME"
fi
if $AVAILABLE_GDAL && [ ! -f "$DATA_DIR/$SPATIALITE_FILENAME" ]; then
fn_echo "Exporting PostGIS data into spatialite database"
fn_echo "Exporting PostGIS data into spatialite database"
$DEPLOY_DIR/gdal/apps/ogr2ogr --config PG_LIST_ALL_TABLES YES --config PG_SKIP_VIEWS YES -progress -f "SQLite" "$DATA_DIR/$SPATIALITE_FILENAME" PG:"host=localhost dbname=isochrone user=$PG_DB_USER password=$PG_DB_PASSWORD" -lco LAUNDER=yes -dsco SPATIALITE=yes -lco SPATIAL_INDEX=yes -gt 65536 >> "$WORKING_DIR/import_spatialite.log" 2>&1
fi
......
bootstrap/prepareEnvironment.sh
+ 6
− 6
View file @ 54a60bff
......@@ -79,7 +79,7 @@ fn_arg2boolean IS_JENKINS_DEPLOY "${3}" "${IS_JENKINS_DEPLOY}"
GDAL_VERSION="2.0.0"
GDAL_FILE="gdal-$GDAL_VERSION.tar.gz"
GDAL_DOWNLOAD_URL="http://download.osgeo.org/gdal/$GDAL_VERSION/$GDAL_FILE"
GEOSERVER_VERSION="2.8.1"
GEOSERVER_VERSION="2.9-RC1"
GEOSERVER_FILE="geoserver-$GEOSERVER_VERSION-war.zip"
GEOSERVER_DOWNLOAD_URL="http://sourceforge.net/projects/geoserver/files/GeoServer/$GEOSERVER_VERSION/$GEOSERVER_FILE"
GEOSERVER_SHELL_VERSION="0.2.1"
......@@ -413,7 +413,7 @@ if $INSTALL_POSTGRES; then
yum -y install $POSTGRESQL_PKG_NAME $POSTGRESQL_PKG_NAME-contrib $POSTGRESQL_PKG_NAME-server >> $WORKING_DIR/install_postgresql.log 2>&1
if $INSTALL_GDAL; then
yum -y install $POSTGRESQL_PKG_NAME-devel >> $WORKING_DIR/install_postgresql.log 2>&1
fi
fi
fn_echo " - exporting postgresql options"
echo "export PostgreSQL_ROOT=\"/usr/pgsql-$POSTGRESQL_VERSION\"" >> /etc/profile.d/postgresql.sh
......@@ -452,7 +452,7 @@ if $INSTALL_JAVA; then
sleep 5
fn_echo "Installing java (oracle jdk-$JAVA_VERSION)"
fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE "${JAVA_DOWNLOAD_URL}/${JAVA_FILE}" "${OTN_LICENSE_PARAMS}"
fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE "${JAVA_DOWNLOAD_URL}/${JAVA_FILE}" "${OTN_LICENSE_PARAMS}"
yum -y localinstall $DOWNLOAD_DIR/$JAVA_FILE >> $WORKING_DIR/install_java.log 2>&1
ln -sf /usr/java/latest $DEPLOY_DIR/jdk >> $WORKING_DIR/setup_java.log 2>&1
ln -sf /usr/java/latest/jre $DEPLOY_DIR/jre >> $WORKING_DIR/setup_java.log 2>&1
......@@ -607,7 +607,7 @@ if $INSTALL_NEO4J; then
fn_echo " - enabling neo4j network access (without user)"
fn_echo "org.neo4j.server.webserver.address=0.0.0.0" >> $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
sed -i "s/dbms\.security\.auth\_enabled=true/dbms\.security\.auth\_enabled=false/" $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
sed -i "s/dbms\.security\.auth\_enabled=true/dbms\.security\.auth\_enabled=false/" $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
fn_echo " - creating systemd service"
cp "$SHARED_CONF_DIR/neo4j.service" "/etc/systemd/system/neo4j.service" >> $DEPLOY_DIR/neo4j/conf/neo4j-server.properties
......@@ -675,7 +675,7 @@ if $INSTALL_SPATIALITE; then
fn_echo "Installing spatialite $SPATIALITE_VERSION (from source)"
fn_download_newer $DOWNLOAD_DIR/$SPATIALITE_FILE $SPATIALITE_URL
tar -xvf $DOWNLOAD_DIR/$SPATIALITE_FILE -C $DEPLOY_DIR >> $WORKING_DIR/install_spatialite.log 2>&1
tar -xvf $DOWNLOAD_DIR/$SPATIALITE_FILE -C $DEPLOY_DIR >> $WORKING_DIR/install_spatialite.log 2>&1
ln -sf $DEPLOY_DIR/libspatialite* $DEPLOY_DIR/libspatialite
cd $DEPLOY_DIR/libspatialite
......@@ -792,7 +792,7 @@ fi
if $INSTALL_SPATIALITE_ADMIN; then
# TODO: Check this (does not seem to work)
# TODO: What to do if there are multiple target_srid defined
# TODO: What to do if there are multiple target_srid defined
fn_echo "Configuring phpLiteAdmin"
cp $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.sample.php $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
sed -i "s/password = 'admin'/password = '${TOMCAT_PASSWORD}'/" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
......
conf/geoserver_setup_styles.gs
+ 4
− 4
View file @ 54a60bff
geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
style create --file /setup/conf/geoserver_style_edge.sld --name StyleEdge
style create --file /setup/conf/geoserver_style_edgeexpiration.sld --name StyleEdgeExpiration
style create --file /setup/conf/geoserver_style_edge.sld --name StyleIsoEdge
style create --file /setup/conf/geoserver_style_edge_expiration.sld --name StyleIsoEdgeExpiration
style create --file /setup/conf/geoserver_style_isocoverage.sld --name StyleIsoCoverage
style create --file /setup/conf/geoserver_style_stations.sld --name StyleTransportationStations
style create --file /setup/conf/geoserver_style_nodeexpiration.sld --name StyleNodeExpiration
style create --file /setup/conf/geoserver_style_node.sld --name StyleIsoNode
style create --file /setup/conf/geoserver_style_node_expiration.sld --name StyleIsoNodeExpiration
conf/geoserver_style_isocoverage.sld → conf/geoserver_style_coverage.sld
+ 1
− 1
View file @ 54a60bff
......@@ -3,7 +3,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
<NamedLayer>
<Name>Default Polygon</Name>
<Name>Isochrone Coverage</Name>
<UserStyle>
<Title>Default polygon style</Title>
<Abstract>A sample style that just draws out a solid gray interior with a black 1px outline</Abstract>
......
conf/geoserver_style_edge.sld
+ 1
− 1
View file @ 54a60bff
......@@ -7,7 +7,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- a Named Layer is the basic building block of an SLD document -->
<NamedLayer>
<Name>Style Black Line</Name>
<Name>Isochrone Edge</Name>
<UserStyle>
<!-- Styles can have names, titles and abstracts -->
<Title>Expiration Edge Style</Title>
......
conf/geoserver_style_edgeexpiration.sld → conf/geoserver_style_edge_expiration.sld
+ 1
− 1
View file @ 54a60bff
......@@ -7,7 +7,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- a Named Layer is the basic building block of an SLD document -->
<NamedLayer>
<Name>default_line</Name>
<Name>Isochrone Edge Expiration</Name>
<UserStyle>
<!-- Styles can have names, titles and abstracts -->
<Title>Expiration Edge Style</Title>
......
conf/geoserver_style_stations.sld → conf/geoserver_style_node.sld
+ 224
− 0
View file @ 54a60bff
......@@ -5,16 +5,38 @@
xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.1.0/filter.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd
http://www.w3.org/1999/xlink http://schemas.opengis.net/xlink/1.0.0/xlinks.xsd">
<NamedLayer>
<Name>TransportationStations for Oracle</Name>
<Name>Isochrone TransportationStations</Name>
<UserStyle>
<Name>Vertices</Name>
<Title>Style of vertices</Title>
<Abstract>Generated by GeoServer</Abstract>
<FeatureTypeStyle>
<Rule>
<Name>Unknown station type</Name>
<Title>Unknown station type</Title>
<MinScaleDenominator>1000</MinScaleDenominator>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
<OnlineResource xlink:type="simple" xlink:href="file:///setup/img/question.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
<ogc:Literal>12</ogc:Literal>
</Size>
</Graphic>
</PointSymbolizer>
<ogc:Filter>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>T_TYPE</ogc:PropertyName>
<ogc:Literal>-1</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
<Rule>
<Name>Tram station</Name>
<Title>Tram stop station</Title>
<Abstract>Abstract</Abstract>
<Title>Tram station</Title>
<MinScaleDenominator>1000</MinScaleDenominator>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<PointSymbolizer>
......@@ -28,6 +50,29 @@
</Size>
</Graphic>
</PointSymbolizer>
<ogc:Filter>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>T_TYPE</ogc:PropertyName>
<ogc:Literal>0</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
<Rule>
<Name>Subway station</Name>
<Title>Subway station</Title>
<MinScaleDenominator>1000</MinScaleDenominator>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
<OnlineResource xlink:type="simple" xlink:href="file:///setup/img/subway.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
<ogc:Literal>12</ogc:Literal>
</Size>
</Graphic>
</PointSymbolizer>
<ogc:Filter>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>T_TYPE</ogc:PropertyName>
......@@ -38,13 +83,12 @@
<Rule>
<Name>Railway station</Name>
<Title>Railway stop station</Title>
<Abstract>Abstract</Abstract>
<MinScaleDenominator>1000</MinScaleDenominator>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
<OnlineResource xlink:type="simple" xlink:href="file:///setup/img/railway.png" />
<OnlineResource xlink:type="simple" xlink:href="file:///setup/img/rail.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
......@@ -62,10 +106,8 @@
<Rule>
<Name>Bus station</Name>
<Title>Bus stop station</Title>
<Abstract>Abstract</Abstract>
<MinScaleDenominator>500</MinScaleDenominator>
<MaxScaleDenominator>100000</MaxScaleDenominator>
<!--MinScaleDenominator>10000</MinScaleDenominator> <MaxScaleDenominator>12000</MaxScaleDenominator -->
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
......@@ -87,14 +129,12 @@
<Rule>
<Name>Ferry station</Name>
<Title>Ferry stop station</Title>
<Abstract>Abstract</Abstract>
<MinScaleDenominator>1000</MinScaleDenominator>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<!--MinScaleDenominator>10000</MinScaleDenominator> <MaxScaleDenominator>12000</MaxScaleDenominator -->
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
<OnlineResource xlink:type="simple" xlink:href="file:///setup/img/ferry.png" />
<OnlineResource xlink:type="simple" xlink:href="file:///setup/img/ship.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
......@@ -109,6 +149,75 @@
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
<Rule>
<Name>Cablecar station</Name>
<Title>Cablecar station</Title>
<MinScaleDenominator>1000</MinScaleDenominator>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
<OnlineResource xlink:type="simple" xlink:href="file:///setup/img/cablecar.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
<ogc:Literal>12</ogc:Literal>
</Size>
</Graphic>
</PointSymbolizer>
<ogc:Filter>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>T_TYPE</ogc:PropertyName>
<ogc:Literal>5</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
<Rule>
<Name>Funicular station</Name>
<Title>Funicular station</Title>
<MinScaleDenominator>1000</MinScaleDenominator>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
<OnlineResource xlink:type="simple" xlink:href="file:///setup/img/funicular.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
<ogc:Literal>12</ogc:Literal>
</Size>
</Graphic>
</PointSymbolizer>
<ogc:Filter>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>T_TYPE</ogc:PropertyName>
<ogc:Literal>6</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
<Rule>
<Name>Gondola station</Name>
<Title>Gondola station</Title>
<MinScaleDenominator>1000</MinScaleDenominator>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
<OnlineResource xlink:type="simple" xlink:href="file:///setup/img/gondola.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
<ogc:Literal>12</ogc:Literal>
</Size>
</Graphic>
</PointSymbolizer>
<ogc:Filter>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>T_TYPE</ogc:PropertyName>
<ogc:Literal>7</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
</FeatureTypeStyle>
</UserStyle>
</NamedLayer>
......
conf/geoserver_style_nodeexpiration.sld → conf/geoserver_style_node_expiration.sld
+ 7
− 7
View file @ 54a60bff
......@@ -3,7 +3,7 @@
xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<Name>Vertices Expiration Mode</Name>
<Name>Isochrone Vertices Expiration</Name>
<UserStyle>
<Name>Vertices in expiration mode</Name>
<Title>Style of vertices in expiration mode</Title>
......@@ -37,8 +37,8 @@
<ogc:Filter>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>STATE</ogc:PropertyName>
<ogc:Literal>OPEN</ogc:Literal>
</ogc:PropertyIsEqualTo>
<ogc:Literal>OPEN</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
<Rule>
......@@ -67,8 +67,8 @@
<ogc:Filter>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>STATE</ogc:PropertyName>
<ogc:Literal>CLOSED</ogc:Literal>
</ogc:PropertyIsEqualTo>
<ogc:Literal>CLOSED</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
<Rule>
......@@ -97,8 +97,8 @@
<ogc:Filter>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>STATE</ogc:PropertyName>
<ogc:Literal>EXPIRED</ogc:Literal>
</ogc:PropertyIsEqualTo>
<ogc:Literal>EXPIRED</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
</FeatureTypeStyle>
......
img/bus.png
+ 0
− 0
View replaced file @ 07217206 View file @ 54a60bff
img/bus.png

3.62 KiB | W: | H:

img/bus.png

1.02 KiB | W: | H:

img/bus.png
img/bus.png
img/bus.png
img/bus.png
  • 2-up
  • Swipe
  • Onion skin
img/bus.xcf 0 → 100644
+ 0
− 0
View file @ 54a60bff
File added
img/cablecar.png 0 → 100644
+ 0
− 0
View file @ 54a60bff
img/cablecar.png

1.31 KiB

img/cablecar.xcf 0 → 100644
+ 0
− 0
View file @ 54a60bff
File added
img/car.png deleted 100755 → 0
+ 0
− 0
View file @ 07217206
img/car.png

847 B

img/ferry.png
+ 0
− 0
View replaced file @ 07217206 View file @ 54a60bff
img/ferry.png

3.62 KiB | W: | H:

img/ferry.png

1.26 KiB | W: | H:

img/ferry.png
img/ferry.png
img/ferry.png
img/ferry.png
  • 2-up
  • Swipe
  • Onion skin
img/ferry.xcf 0 → 100644
+ 0
− 0
View file @ 54a60bff
File added
img/funicular.png 0 → 100644
+ 0
− 0
View file @ 54a60bff
img/funicular.png

1.31 KiB

img/funicular.xcf 0 → 100644
+ 0
− 0
View file @ 54a60bff
File added
img/gondola.png 0 → 100644
+ 0
− 0
View file @ 54a60bff
img/gondola.png

1.4 KiB

img/gondola.xcf 0 → 100644
+ 0
− 0
View file @ 54a60bff
File added
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment