diff --git a/CHANGELOG.md b/CHANGELOG.md
index db3b79b2b6a7705dd5dcf18c93e121209aaf3492..72cca928724a35f9987a4ffeb8a48cc7679a75cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@ Upcoming version:
-----------------
- version upgrade of apache-tomcat (Nikolaus Krismer)
- version upgrade of apache-tomcat (Nikolaus Krismer)
+ - version upgrade of apache-tomcat (Nikolaus Krismer)
+ - gradle update to version 2.14 (Nikolaus Krismer)
+ - version upgrades for geoserver, java and neo4j (Nikolaus Krismer)
+ - fixed geoserver installation icons/styles (Nikolaus Krismer)
+ - gradle wrapper update to version 2.13 (Nikolaus Krismer)
Version v0.6.1:
---------------
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index cb6ac1458199c80390ad1049e8238b9bf7b30d4e..43452032e2f3ea7192f80ca71f3316b0ada71e10 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -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
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index 5abd7865e008580c4b7974e7cf488c6f3774d63e..954211505b17937f93484ae45d526139434463a8 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -79,14 +79,14 @@ 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.0"
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"
GEOSERVER_SHELL_FILE="geoserver-shell-$GEOSERVER_SHELL_VERSION-app.zip"
GEOSERVER_SHELL_URL="https://github.com/jericks/geoserver-shell/releases/download/0.2/$GEOSERVER_SHELL_FILE"
-JAVA_VERSION="8u74"
-JAVA_VERSION_BUILD="8u74-b02"
+JAVA_VERSION="8u91"
+JAVA_VERSION_BUILD="8u91-b14"
JAVA_DOWNLOAD_URL="http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_BUILD}"
JAVA_FILE_32="jdk-${JAVA_VERSION}-linux-i586.rpm"
JAVA_FILE_64="jdk-${JAVA_VERSION}-linux-x64.rpm"
@@ -97,7 +97,7 @@ MAVEN_VERSION="3.3.9"
MAVEN_FILE="apache-maven-$MAVEN_VERSION-bin.zip"
MAVEN_DOWNLOAD_URL="http://www.eu.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/$MAVEN_FILE"
NEO4J_DB_USER="neo4j"
-NEO4J_VERSION="2.3.2"
+NEO4J_VERSION="3.0.1"
NEO4J_FILE="neo4j-community-$NEO4J_VERSION-unix.tar.gz"
NEO4J_DOWNLOAD_URL="http://neo4j.com/artifact.php?name=$NEO4J_FILE"
NEO4J_SERVICE_NAME="neo4j"
@@ -792,7 +792,11 @@ fi
if $INSTALL_SPATIALITE_ADMIN; then
# TODO: Check this (does not seem to work)
+<<<<<<< HEAD
# TODO: What to do if there are multiple target_srid defined?
+=======
+ # TODO: What to do if there are multiple target_srid defined
+>>>>>>> 8b36dab25de690b11838ff650c718406021fcf6a
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
diff --git a/conf/geoserver_setup_styles.gs b/conf/geoserver_setup_styles.gs
index 1a03273de63ba8b1e50326a9ea0c4aaeb0e254c0..ef745eaaa727b2093582e4dda4448a4f57ac1b34 100644
--- a/conf/geoserver_setup_styles.gs
+++ b/conf/geoserver_setup_styles.gs
@@ -1,7 +1,7 @@
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
diff --git a/conf/geoserver_style_isocoverage.sld b/conf/geoserver_style_coverage.sld
similarity index 94%
rename from conf/geoserver_style_isocoverage.sld
rename to conf/geoserver_style_coverage.sld
index 638344f0e67dc0550c1ed447a3909c510c9a9025..a7f1e61671e63da55b93cc1767ea8d1ef264f99f 100644
--- a/conf/geoserver_style_isocoverage.sld
+++ b/conf/geoserver_style_coverage.sld
@@ -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>
diff --git a/conf/geoserver_style_edge.sld b/conf/geoserver_style_edge.sld
index 3d7dcbffa4e850b8192c8c2c6254a27d68ff4f58..33768e3c08ab9669fb932fbbdfaa663bdc54f29a 100644
--- a/conf/geoserver_style_edge.sld
+++ b/conf/geoserver_style_edge.sld
@@ -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>
diff --git a/conf/geoserver_style_edgeexpiration.sld b/conf/geoserver_style_edge_expiration.sld
similarity index 94%
rename from conf/geoserver_style_edgeexpiration.sld
rename to conf/geoserver_style_edge_expiration.sld
index 8a95ade12b4b1f34a5e59dc8320d898e58f763fd..3f6b6991049ce2c82a1b2b9b5875623499322efa 100644
--- a/conf/geoserver_style_edgeexpiration.sld
+++ b/conf/geoserver_style_edge_expiration.sld
@@ -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>
diff --git a/conf/geoserver_style_node.sld b/conf/geoserver_style_node.sld
new file mode 100644
index 0000000000000000000000000000000000000000..96da202a401bd326b9a9312d95164cc57ce4c5d7
--- /dev/null
+++ b/conf/geoserver_style_node.sld
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<StyledLayerDescriptor version="1.0.0"
+ xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/sld"
+ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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>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 station</Title>
+ <MinScaleDenominator>1000</MinScaleDenominator>
+ <MaxScaleDenominator>50000</MaxScaleDenominator>
+ <PointSymbolizer>
+ <Graphic>
+ <ExternalGraphic>
+ <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/tram.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>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>
+ <ogc:Literal>1</ogc:Literal>
+ </ogc:PropertyIsEqualTo>
+ </ogc:Filter>
+ </Rule>
+ <Rule>
+ <Name>Railway station</Name>
+ <Title>Railway stop station</Title>
+ <MinScaleDenominator>1000</MinScaleDenominator>
+ <MaxScaleDenominator>50000</MaxScaleDenominator>
+ <PointSymbolizer>
+ <Graphic>
+ <ExternalGraphic>
+ <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/rail.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>2</ogc:Literal>
+ </ogc:PropertyIsEqualTo>
+ </ogc:Filter>
+ </Rule>
+ <Rule>
+ <Name>Bus station</Name>
+ <Title>Bus stop station</Title>
+ <MinScaleDenominator>500</MinScaleDenominator>
+ <MaxScaleDenominator>100000</MaxScaleDenominator>
+ <PointSymbolizer>
+ <Graphic>
+ <ExternalGraphic>
+ <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/bus.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>3</ogc:Literal>
+ </ogc:PropertyIsEqualTo>
+ </ogc:Filter>
+ </Rule>
+ <Rule>
+ <Name>Ferry station</Name>
+ <Title>Ferry stop station</Title>
+ <MinScaleDenominator>1000</MinScaleDenominator>
+ <MaxScaleDenominator>50000</MaxScaleDenominator>
+ <PointSymbolizer>
+ <Graphic>
+ <ExternalGraphic>
+ <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/ship.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>4</ogc:Literal>
+ </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>
+</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/conf/geoserver_style_nodeexpiration.sld b/conf/geoserver_style_node_expiration.sld
similarity index 89%
rename from conf/geoserver_style_nodeexpiration.sld
rename to conf/geoserver_style_node_expiration.sld
index 7e04fe6110867e00d5b639de5cea284a1d424199..e88b3257ae7a009585c965b5fe35f7bd89024a9f 100644
--- a/conf/geoserver_style_nodeexpiration.sld
+++ b/conf/geoserver_style_node_expiration.sld
@@ -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>
diff --git a/conf/geoserver_style_stations.sld b/conf/geoserver_style_stations.sld
deleted file mode 100644
index 5190b3e7444c7b8bb7c86dbadde00ca928cc5d83..0000000000000000000000000000000000000000
--- a/conf/geoserver_style_stations.sld
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
- xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/sld"
- xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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>
- <UserStyle>
- <Name>Vertices</Name>
- <Title>Style of vertices</Title>
- <Abstract>Generated by GeoServer</Abstract>
- <FeatureTypeStyle>
- <Rule>
- <Name>Tram station</Name>
- <Title>Tram stop station</Title>
- <Abstract>Abstract</Abstract>
- <MinScaleDenominator>1000</MinScaleDenominator>
- <MaxScaleDenominator>50000</MaxScaleDenominator>
- <PointSymbolizer>
- <Graphic>
- <ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/tram.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>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" />
- <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>2</ogc:Literal>
- </ogc:PropertyIsEqualTo>
- </ogc:Filter>
- </Rule>
- <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>
- <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/bus.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>3</ogc:Literal>
- </ogc:PropertyIsEqualTo>
- </ogc:Filter>
- </Rule>
- <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" />
- <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>4</ogc:Literal>
- </ogc:PropertyIsEqualTo>
- </ogc:Filter>
- </Rule>
- </FeatureTypeStyle>
- </UserStyle>
- </NamedLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5ccda13e9cb94678ba179b32452cf3d60dc36353..d3b83982b9b1bccad955349d702be9b884c6e049 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d9e3d61c0d8db587c5d1549079318d427d3ace76..9400414fe61f4bd57dc57f357833894078ed2635 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Feb 23 12:28:19 CET 2016
+#Wed Jun 15 12:15:57 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
diff --git a/gradlew b/gradlew
index 9d82f78915133e1c35a6ea51252590fb38efac2f..27309d92314c57d6e442529f1362bafc8376feae 100755
--- a/gradlew
+++ b/gradlew
@@ -6,12 +6,30 @@
##
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
diff --git a/gradlew.bat b/gradlew.bat
index 72d362dafd896f845f13c55bf925b14c5c8faa1d..f6d5974e72fdac64fbae9aeb32c28cb8b69a92d5 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/img/bus.png b/img/bus.png
index 4516c824c31092ea3135e054947b73b4ec8f0d14..b74896872b063cfb0467bc850b64068ff77fd38a 100755
Binary files a/img/bus.png and b/img/bus.png differ
diff --git a/img/bus.xcf b/img/bus.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..f37b47abecea177688eaca1b0bde2f420de39fbe
Binary files /dev/null and b/img/bus.xcf differ
diff --git a/img/cablecar.png b/img/cablecar.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e7b12e4dd1232d92d5fc54a9ef5c434b7a188b
Binary files /dev/null and b/img/cablecar.png differ
diff --git a/img/cablecar.xcf b/img/cablecar.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..f33090e74f1fac9fb7257df15961cccd29757adf
Binary files /dev/null and b/img/cablecar.xcf differ
diff --git a/img/car.png b/img/car.png
deleted file mode 100755
index 6c020437963e0ab51c9b41c4035f7a8f5e9d05c5..0000000000000000000000000000000000000000
Binary files a/img/car.png and /dev/null differ
diff --git a/img/ferry.png b/img/ferry.png
index 4516c824c31092ea3135e054947b73b4ec8f0d14..3055be36fbe9e367d77e8626378c6a1c08360c2f 100755
Binary files a/img/ferry.png and b/img/ferry.png differ
diff --git a/img/ferry.xcf b/img/ferry.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..fbcbfafc2ed2835131c7d64e352bb1de24413b76
Binary files /dev/null and b/img/ferry.xcf differ
diff --git a/img/funicular.png b/img/funicular.png
new file mode 100644
index 0000000000000000000000000000000000000000..70af0b1b9fb7cedf1ebd2558beb8c89b5b48a1b3
Binary files /dev/null and b/img/funicular.png differ
diff --git a/img/funicular.xcf b/img/funicular.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..f33090e74f1fac9fb7257df15961cccd29757adf
Binary files /dev/null and b/img/funicular.xcf differ
diff --git a/img/gondola.png b/img/gondola.png
new file mode 100644
index 0000000000000000000000000000000000000000..a70b6fba676cdb9937152c81bfb0f82dbf7244f0
Binary files /dev/null and b/img/gondola.png differ
diff --git a/img/gondola.xcf b/img/gondola.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..1394b432a7529f4434effabba4e503e2ae8cb0e5
Binary files /dev/null and b/img/gondola.xcf differ
diff --git a/img/other.png b/img/other.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ab35d6af6c132a614c5991181b8dc3a094c8170
Binary files /dev/null and b/img/other.png differ
diff --git a/img/other.xcf b/img/other.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..9490341fdabcee4d06af3af22fb751c2e12d3572
Binary files /dev/null and b/img/other.xcf differ
diff --git a/img/rail.png b/img/rail.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccdd4a5b06941a9172be13038a09d923f18248c1
Binary files /dev/null and b/img/rail.png differ
diff --git a/img/rail.xcf b/img/rail.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..459eba0608209729e0ba835ebf21015dd0e5c31c
Binary files /dev/null and b/img/rail.xcf differ
diff --git a/img/subway.png b/img/subway.png
new file mode 100644
index 0000000000000000000000000000000000000000..63a2eba1494fee23594736f06179dc896514bdb7
Binary files /dev/null and b/img/subway.png differ
diff --git a/img/subway.xcf b/img/subway.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..eea1c69e830633f38a2ad8fda382d5b60c01f482
Binary files /dev/null and b/img/subway.xcf differ
diff --git a/img/tram.png b/img/tram.png
index 4516c824c31092ea3135e054947b73b4ec8f0d14..10bf58fc5240008be267b2daf6b0e261fb25774f 100755
Binary files a/img/tram.png and b/img/tram.png differ
diff --git a/img/tram.xcf b/img/tram.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..459eba0608209729e0ba835ebf21015dd0e5c31c
Binary files /dev/null and b/img/tram.xcf differ