From f2dda7c8ebe107486e9a061b4300030c97792294 Mon Sep 17 00:00:00 2001 From: Emux Date: Mon, 6 Feb 2017 20:07:55 +0200 Subject: [PATCH] vtm-web-app: include theme with texture atlas symbols #51 --- vtm-themes/icons/atlas/maki.xml | 2 +- vtm-themes/icons/atlas/osm.xml | 2 +- vtm-themes/icons/atlas/osmarender.xml | 2 +- vtm-web-app/build.gradle | 7 + vtm-web-app/resources/assets/atlas/osm.png | Bin 0 -> 11628 bytes .../resources/assets/vtm/default_atlas.xml | 1250 +++++++++++++++++ .../src/org/oscim/web/client/GwtMap.java | 5 +- 7 files changed, 1264 insertions(+), 4 deletions(-) create mode 100644 vtm-web-app/resources/assets/atlas/osm.png create mode 100644 vtm-web-app/resources/assets/vtm/default_atlas.xml diff --git a/vtm-themes/icons/atlas/maki.xml b/vtm-themes/icons/atlas/maki.xml index c0b618d3..1e160e95 100644 --- a/vtm-themes/icons/atlas/maki.xml +++ b/vtm-themes/icons/atlas/maki.xml @@ -1,4 +1,4 @@ - + diff --git a/vtm-themes/icons/atlas/osm.xml b/vtm-themes/icons/atlas/osm.xml index 9f768a2b..dd97b45c 100644 --- a/vtm-themes/icons/atlas/osm.xml +++ b/vtm-themes/icons/atlas/osm.xml @@ -1,4 +1,4 @@ - + diff --git a/vtm-themes/icons/atlas/osmarender.xml b/vtm-themes/icons/atlas/osmarender.xml index 07e3e8f3..b22de45e 100644 --- a/vtm-themes/icons/atlas/osmarender.xml +++ b/vtm-themes/icons/atlas/osmarender.xml @@ -1,4 +1,4 @@ - + diff --git a/vtm-web-app/build.gradle b/vtm-web-app/build.gradle index deb41bea..8001bdb7 100644 --- a/vtm-web-app/build.gradle +++ b/vtm-web-app/build.gradle @@ -68,6 +68,12 @@ task copyThemeAssets(type: Copy) { include '**/*' } +task copyThemeLocalAssets(type: Copy) { + from "resources/assets" + into "assets" + include '**/*' +} + task copyVtmAssets(type: Copy) { from "$rootDir/vtm/resources/assets" into "assets" @@ -82,6 +88,7 @@ task copyWarSources(type: Copy) { tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyThemeAssets + compileTask.dependsOn copyThemeLocalAssets compileTask.dependsOn copyVtmAssets compileTask.dependsOn copyWarSources } diff --git a/vtm-web-app/resources/assets/atlas/osm.png b/vtm-web-app/resources/assets/atlas/osm.png new file mode 100644 index 0000000000000000000000000000000000000000..463bb5c989d42db5b36ad084900ace60a26637e1 GIT binary patch literal 11628 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vtm-web-app/src/org/oscim/web/client/GwtMap.java b/vtm-web-app/src/org/oscim/web/client/GwtMap.java index 837d2584..6457b375 100644 --- a/vtm-web-app/src/org/oscim/web/client/GwtMap.java +++ b/vtm-web-app/src/org/oscim/web/client/GwtMap.java @@ -21,6 +21,7 @@ package org.oscim.web.client; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.backends.gwt.GwtApplication; +import org.oscim.backend.AssetAdapter; import org.oscim.backend.CanvasAdapter; import org.oscim.backend.GL; import org.oscim.backend.GLAdapter; @@ -36,6 +37,7 @@ import org.oscim.layers.tile.buildings.S3DBLayer; import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.renderer.MapRenderer; +import org.oscim.theme.StreamRenderTheme; import org.oscim.theme.VtmThemes; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.bitmap.BitmapTileSource; @@ -115,7 +117,8 @@ class GwtMap extends GdxMap { l = mMap.setBaseMap(ts); if (themeName == null) { - mMap.setTheme(VtmThemes.DEFAULT); + // Local theme with texture atlas using png + mMap.setTheme(new StreamRenderTheme("", AssetAdapter.readFileAsStream("vtm/default_atlas.xml"))); } else { if ("osmarender".equals(themeName)) mMap.setTheme(VtmThemes.OSMARENDER);