finish first part of database -> tilesource refactoring

- now there is a clean separation between TileSource type and TileDataSource(worker instances)
2013-05-27 03:13:24 +02:00
parent 2be2ab111a
commit 4abec66e39
47 changed files with 666 additions and 643 deletions
--- a/src/org/oscim/theme/MatchingCacheKey.java
+++ b/src/org/oscim/theme/MatchingCacheKey.java
@@ -24,7 +24,7 @@ class MatchingCacheKey {
 	}

 	MatchingCacheKey(MatchingCacheKey key) {
-		// need to clone tags as they belong to MapDatabase
+		// need to clone tags as they belong to TileDataSource
 		mTags = key.mTags.clone();
 		mHash = key.mHash;
 	}
--- a/src/org/oscim/theme/styles/default.xml
+++ b/src/org/oscim/theme/styles/default.xml
@@ -228,7 +228,9 @@


      <!-- keep grass above forest:wood and leisure:park! -->
-      <rule e="way" k="landuse" v="grass|meadow">
+      <!-- http://wiki.openstreetmap.org/wiki/Proposed_features/conservation,
+           often serves as background for leisure=nature_reserve -->
+      <rule e="way" k="landuse" v="grass|meadow|conservation">
        <use-area name="greens" />
      </rule>