Permalink
Browse files

Internal render themes own module, closes #848

  • Loading branch information...
devemux86 committed Jun 30, 2016
1 parent 45408e7 commit ff83f875275ff0904e9a3b951780f88c9e86359f
Showing with 56 additions and 2 deletions.
  1. +1 −1 build.gradle
  2. +1 −0 docs/Changelog.md
  3. +1 −0 docs/Getting-Started-Developers.md
  4. +1 −1 mapsforge-map-awt/build.gradle
  5. +7 −0 mapsforge-map-awt/pom.xml
  6. +1 −0 mapsforge-samples-android/build.gradle
  7. +6 −0 mapsforge-samples-android/pom.xml
  8. +1 −0 mapsforge-samples-awt/build.gradle
  9. +6 −0 mapsforge-samples-awt/pom.xml
  10. +3 −0 mapsforge-themes/build.gradle
  11. +26 −0 mapsforge-themes/pom.xml
  12. 0 ...orge-map → mapsforge-themes}/src/main/java/org/mapsforge/map/rendertheme/InternalRenderTheme.java
  13. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/osmarender.xml
  14. BIN {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/patterns/access-destination.png
  15. BIN {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/patterns/access-private.png
  16. BIN {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/patterns/cemetery.png
  17. BIN {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/patterns/marsh.png
  18. BIN {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/patterns/military.png
  19. BIN {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/patterns/nature-reserve.png
  20. BIN {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/patterns/wood-coniferous.png
  21. BIN {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/patterns/wood-deciduous.png
  22. BIN {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/patterns/wood-mixed.png
  23. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/airport.svg
  24. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/alpine_hut.svg
  25. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/atm.svg
  26. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/bakery.svg
  27. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/bank.svg
  28. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/bench.svg
  29. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/bicycle_rental.svg
  30. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/bus.svg
  31. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/bus_sta.svg
  32. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/cable_car.svg
  33. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/cafe.svg
  34. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/campSite.svg
  35. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/cave_entrance.svg
  36. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/chair_lift_2.svg
  37. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/church.svg
  38. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/cinema.svg
  39. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/drinking_water.svg
  40. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/fastfood.svg
  41. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/firebrigade.svg
  42. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/florist.svg
  43. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/fountain.svg
  44. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/gondola.svg
  45. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/helipad.svg
  46. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/hospital.svg
  47. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/hostel.svg
  48. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/hotel.svg
  49. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/information.svg
  50. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/kindergarten.svg
  51. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/library.svg
  52. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/monument.svg
  53. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/mosque.svg
  54. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/oneway.svg
  55. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/parking.svg
  56. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/peak.svg
  57. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/petrolStation.svg
  58. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/pharmacy.svg
  59. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/playground.svg
  60. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/postbox.svg
  61. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/postoffice.svg
  62. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/pub.svg
  63. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/railway-crossing-small.svg
  64. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/railway-crossing.svg
  65. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/recycling.svg
  66. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/restaurant.svg
  67. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/school.svg
  68. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/shelter.svg
  69. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/soccer-borderless.svg
  70. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/supermarket.svg
  71. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/synagogue.svg
  72. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/telephone.svg
  73. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/tennis.svg
  74. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/theatre.svg
  75. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/toilets.svg
  76. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/traffic_signal.svg
  77. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/train_station.svg
  78. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/train_station2.svg
  79. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/tree.svg
  80. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/university.svg
  81. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/viewpoint.svg
  82. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/vulcan.svg
  83. 0 {mapsforge-map → mapsforge-themes}/src/main/resources/osmarender/symbols/windmill.svg
  84. +1 −0 pom.xml
  85. +1 −0 settings.gradle
View
@@ -46,7 +46,7 @@ subprojects {
// Configuration for all plain Java projects
-project.ext.javaprojects = ["mapsforge-core", "mapsforge-map", "mapsforge-map-reader", "mapsforge-map-awt", "mapsforge-map-writer", "mapsforge-poi", "mapsforge-poi-awt", "mapsforge-poi-writer", "mapsforge-samples-awt"]
+project.ext.javaprojects = ["mapsforge-core", "mapsforge-map", "mapsforge-themes", "mapsforge-map-reader", "mapsforge-map-awt", "mapsforge-map-writer", "mapsforge-poi", "mapsforge-poi-awt", "mapsforge-poi-writer", "mapsforge-samples-awt"]
configure(filterProjects(project.javaprojects)) {
apply plugin: 'java'
View
@@ -2,6 +2,7 @@
## New since 0.6.1
+- Internal render themes own module [#848](https://github.com/mapsforge/mapsforge/issues/848)
- Deprecate water tiles rendering [#640](https://github.com/mapsforge/mapsforge/issues/640)
- Drop of `dev` branch
- Many other minor improvements and bug fixes
@@ -24,6 +24,7 @@ Mapsforge consists of the following core components:
- mapsforge-core: platform unspecific general components and interfaces.
- mapsforge-map: platform unspecific elements used for map display.
+- mapsforge-themes: internal render themes collection.
- mapsforge-map-reader: platform unspecific code to read mapsforge map files.
- mapsforge-poi: platform unspecific poi elements.
- [kXML2](http://www.kxml.org/): lightweight XML parser for render themes.
@@ -1,7 +1,7 @@
dependencies {
compile project(":mapsforge-map-reader")
compile group: 'com.kitfox.svg', name: 'svg-salamander', version: '1.0'
- testCompile project(":mapsforge-map")
+ testCompile project(":mapsforge-themes")
}
task fatJar(type: Jar, dependsOn: classes) {
@@ -47,6 +47,13 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mapsforge</groupId>
+ <artifactId>mapsforge-themes</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>com.kitfox.svg</groupId>
<artifactId>svg-salamander</artifactId>
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
dependencies {
compile project(":mapsforge-map-android-extras")
+ compile project(":mapsforge-themes")
compile project(":mapsforge-poi-android")
androidTestCompile group: 'com.jayway.android.robotium', name: 'robotium-solo', version: '5.5.2'
}
@@ -122,6 +122,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mapsforge</groupId>
+ <artifactId>mapsforge-themes</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.mapsforge</groupId>
<artifactId>mapsforge-poi-android</artifactId>
@@ -1,5 +1,6 @@
dependencies {
compile project(":mapsforge-map-awt")
+ compile project(":mapsforge-themes")
}
task fatJar(type: Jar, dependsOn: classes) {
@@ -53,6 +53,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mapsforge</groupId>
+ <artifactId>mapsforge-themes</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -0,0 +1,3 @@
+dependencies {
+ compile project(":mapsforge-map")
+}
View
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.mapsforge</groupId>
+ <artifactId>mapsforge</artifactId>
+ <version>master-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>mapsforge-themes</artifactId>
+
+ <properties>
+ <rootDirectory>../</rootDirectory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.mapsforge</groupId>
+ <artifactId>mapsforge-map</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
View
@@ -30,6 +30,7 @@
<modules>
<module>mapsforge-core</module>
<module>mapsforge-map</module>
+ <module>mapsforge-themes</module>
<module>mapsforge-map-reader</module>
<module>mapsforge-map-android</module>
<module>mapsforge-map-android-extras</module>
View
@@ -1,5 +1,6 @@
include ':mapsforge-core'
include ':mapsforge-map'
+include ':mapsforge-themes'
include ':mapsforge-map-reader'
include ':mapsforge-map-android'
include ':mapsforge-map-android-extras'

0 comments on commit ff83f87

Please sign in to comment.