Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gis/mod_tile/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PortGroup github 1.0

github.setup openstreetmap mod_tile 0.8.1 v
github.tarball_from archive
revision 1
revision 2

categories-append gis
maintainers {@frankdean fdsd.co.uk:frank.dean} openmaintainer
Expand Down Expand Up @@ -50,6 +50,7 @@ depends_lib port:curl \

depends_run port:gsed \
port:openstreetmap-carto \
port:osm2pgsql \
port:wget

set agent_name fetch-osm-db-updates
Expand Down
8 changes: 4 additions & 4 deletions gis/mod_tile/files/openstreetmap-tiles-update-expire.diff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- utils/openstreetmap-tiles-update-expire~ 2024-06-21 02:56:34
+++ utils/openstreetmap-tiles-update-expire 2024-12-26 18:32:44
--- utils/openstreetmap-tiles-update-expire~ 2025-11-19 14:40:49
+++ utils/openstreetmap-tiles-update-expire 2025-11-19 14:39:31
@@ -19,13 +19,34 @@

#*************************************************************************
Expand All @@ -23,7 +23,7 @@
+#------------------------------------------------------------------------------
+ACCOUNT="${GIS_USER:-nobody}"
+OSMOSIS_BIN=${PREFIX}/bin/osmosis
+OSM2PGSQL_BIN=${PREFIX}/bin/osm2pgsql-lua
+OSM2PGSQL_BIN=${PREFIX}/bin/osm2pgsql
+OSM2PGSQL_RAM="${OSM2PGSQL_RAM:-4096}"
+OSM2PGSQL_CPUS="${OSM2PGSQL_CPUS:-4}"
+DBNAME="${GIS_DB:-gis}"
Expand Down Expand Up @@ -138,7 +138,7 @@
+# delete >= $EXPIRY_DELETEFROM and <= $EXPIRY_MAXZOOM.
+# The default path to renderd.sock is fixed.
+#------------------------------------------------------------------------------
+ if ! render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM --tile-dir=${PREFIX}/var/lib/mod_tile -s ${PREFIX}/var/run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
+ if ! ${PREFIX}/bin/render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM --tile-dir=${PREFIX}/var/lib/mod_tile -s ${PREFIX}/var/run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
m_info "Expiry failed"
fi

Expand Down
7 changes: 6 additions & 1 deletion gis/mod_tile/files/osm_setup_db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ GIS_DB_USER="${GIS_DB_USER:-$GIS_USER}"
PG_SUPER_USER="${PG_SUPER_USER:-postgres}"
CURL_BIN="$PREFIX/bin/curl"
MD5SUM_BIN="$PREFIX/bin/gmd5sum"
OSM2PGSQL_BIN="$PREFIX/bin/osm2pgsql-lua"
OSM2PGSQL_BIN="$PREFIX/bin/osm2pgsql"
PBF_DOWNLOAD_BASE_URL="${PBF_DOWNLOAD_BASE_URL:-https://download.geofabrik.de}"
PBF_FILENAME="${PBF_FILENAME:-europe/monaco-latest.osm.pbf}"
POLY_FILENAME="${POLY_FILENAME:-europe/monaco.poly}"
Expand All @@ -100,6 +100,11 @@ if [ $(id -u) -ne 0 ]; then
exit 0
fi

if [ ! -x "$OSM2PGSQL_BIN" ]; then
>&2 echo "$OSM2PGSQL_BIN not found. Please install the osm2pgsql port."
exit 1
fi

initializeDatabase()
{
sudo -u "$PG_SUPER_USER" "$PGSQLBINPATH/createuser" "$GIS_DB_USER" -DRS >/dev/null 2>&1
Expand Down