From 7ce67a99d9821045e4b97de186060901ac64e449 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Thu, 27 Aug 2026 13:43:53 +0200 Subject: [PATCH] luci-app-adblock: replace the CARTO basemap with local outlines CARTO now requires an API key for the raster basemaps at basemaps.cartocdn.com and watermarks every unauthenticated tile request, so the GeoIP map currently renders "API KEY REQUIRED" across the whole viewport. The basemap is now drawn from country outlines that ship with the package: Natural Earth 1:110m, public domain, all attributes stripped, simplified to 36 kB (~10 kB in the apk). Signed-off-by: Dirk Brenken --- applications/luci-app-adblock/Makefile | 2 +- .../resources/view/adblock/map.html | 194 +++++++++++++++--- .../resources/view/adblock/world.json | 1 + 3 files changed, 173 insertions(+), 24 deletions(-) create mode 100644 applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/world.json diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile index 05c19b6ebb..3147779d4b 100644 --- a/applications/luci-app-adblock/Makefile +++ b/applications/luci-app-adblock/Makefile @@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for Adblock LUCI_DEPENDS:=+luci-base +luci-lib-uqr +adblock PKG_VERSION:=4.5.7 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Dirk Brenken diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/map.html b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/map.html index 950baf1e67..5abf12f263 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/map.html +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/map.html @@ -9,6 +9,25 @@