Permalink
Browse files

Drop 'dev' branch

  • Loading branch information...
1 parent 8522cda commit bc6082089e89eebd287c8fa0dcd528130ce4be4a @devemux86 devemux86 committed Jun 11, 2016
@@ -6,7 +6,7 @@ Before you start working on an unresolved issue or try to implement a new featur
You may also create a new issue on [Github](https://github.com/mapsforge/mapsforge/issues) or comment on an existing one to describe your ideas. We will then discuss the best way to realize your proposal and figure out how we can help you to get started quickly.
-If you are only requesting a small change in the code, you may attach a patch file to the corresponding issue, but it is best to create a pull request on Github. Make sure that your patch is derived from the latest version in our **dev** repository, otherwise we might be unable to apply it. Please follow our code and style conventions. Detailed information about them can be found in the [Project Conventions](docs/Project-Conventions.md) article.
+If you are only requesting a small change in the code, you may attach a patch file to the corresponding issue, but it is best to create a pull request on Github. Make sure that your patch is derived from the latest version in our **master** repository, otherwise we might be unable to apply it. Please follow our code and style conventions. Detailed information about them can be found in the [Project Conventions](docs/Project-Conventions.md) article.
Also please keep the pull request commits squashed, in order to avoid the clutter in repository and have only the finally changed files together. One way is described [here](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html).
View
@@ -2,6 +2,7 @@
## New since 0.6.1
+- Drop of `dev` branch
- Many other minor improvements and bug fixes
- [Solved issues](https://github.com/mapsforge/mapsforge/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.6.2)
View
@@ -41,20 +41,10 @@ These are the downloads for old versions. If possible use the newer release, we
## Latest Master Build Downloads
-The master branch contains the latest mapsforge version considered stable, but not yet released. Use this branch if you want to stay up-to-date with mapsforge stable versions.
+These are the latest development builds from the master branch. Use this if you want the latest mapsforge features and can live with some instability.
- [Samples application (old permissions)](http://ci.mapsforge.org/job/master/lastSuccessfulBuild/artifact/mapsforge-samples-android/build/outputs/apk/mapsforge-samples-android-oldpermissions-debug.apk)
- [Samples application (runtime permissions)](http://ci.mapsforge.org/job/master/lastSuccessfulBuild/artifact/mapsforge-samples-android/build/outputs/apk/mapsforge-samples-android-runtimepermissions-debug.apk)
- [Latest jars](http://ci.mapsforge.org/job/master/)
- [Map writer plugin](http://ci.mapsforge.org/job/master/lastSuccessfulBuild/artifact/mapsforge-map-writer/build/libs/mapsforge-map-writer-master-SNAPSHOT-jar-with-dependencies.jar)
- [POI writer plugin](http://ci.mapsforge.org/job/master/lastSuccessfulBuild/artifact/mapsforge-poi-writer/build/libs/mapsforge-poi-writer-master-SNAPSHOT-jar-with-dependencies.jar)
-
-## Latest Development Build Downloads
-
-These are the latest development builds from the dev branch. Use this branch if you want the latest mapsforge features and are prepared for some instability.
-
-- [Samples application (old permissions)](http://ci.mapsforge.org/job/dev/lastSuccessfulBuild/artifact/mapsforge-samples-android/build/outputs/apk/mapsforge-samples-android-oldpermissions-debug.apk)
-- [Samples application (runtime permissions)](http://ci.mapsforge.org/job/dev/lastSuccessfulBuild/artifact/mapsforge-samples-android/build/outputs/apk/mapsforge-samples-android-runtimepermissions-debug.apk)
-- [Latest jars](http://ci.mapsforge.org/job/dev/)
-- [Map writer plugin](http://ci.mapsforge.org/job/dev/lastSuccessfulBuild/artifact/mapsforge-map-writer/build/libs/mapsforge-map-writer-dev-SNAPSHOT-jar-with-dependencies.jar)
-- [POI writer plugin](http://ci.mapsforge.org/job/dev/lastSuccessfulBuild/artifact/mapsforge-poi-writer/build/libs/mapsforge-poi-writer-dev-SNAPSHOT-jar-with-dependencies.jar)
@@ -49,10 +49,9 @@ External dependencies jars can be found at their respective sites or in Maven ce
### Branches
-The mapsforge code has now been consolidated into two main branches as well as releases
-- **master**: the latest stable development branch. Use this if you want to use newer mapsforge functionality that has not yet been released, but you still want a certain stability.
-- **dev**: unstable development, features in progress. Use this if you want the latest development features and you can live with some instability.
-- **release**: use this if you want to build applications built on top of well-tested and stable code.
+The mapsforge code has now been consolidated into a main branch as well as releases:
+- **master**: use this if you want the latest development features and can live with some instability.
+- **release**: use this if you want to build applications on top of well-tested and stable code.
Code before latest release is not supported anymore (we do not have the resources to do this) and if you are starting development with mapsforge, its use is strongly discouraged.
@@ -100,7 +100,7 @@ The old practice of implicitly assuming that the background is land-coloured and
This section describes how to configure the ***known tag set*** via an XML file. The *known tag set* comprises all OSM tags (for ways and POIs) that are known to the renderer. You can use the XML configuration to define which subset of the known tag set should be included in the map file and to configure the zoom levels on which map objects first appear.
The default internal tag mapping defined in https://github.com/mapsforge/mapsforge/blob/master/mapsforge-map-writer/src/main/config/tag-mapping.xml is kept in sync with the known tag set of the renderer. So, if you want to define your own custom mapping use the internal mapping as a reference.
-Please consult the XML-Schema documentation of https://github.com/mapsforge/mapsforge/blob/dev/resources/tag-mapping.xsd to learn about how to implement your custom mapping. The XML-Schema is very easy to understand. We recommend to use Eclipse as an editor for XML as it allows for auto-completion if you provide an XML-Schema.
+Please consult the XML-Schema documentation of https://github.com/mapsforge/mapsforge/blob/master/resources/tag-mapping.xsd to learn about how to implement your custom mapping. The XML-Schema is very easy to understand. We recommend to use Eclipse as an editor for XML as it allows for auto-completion if you provide an XML-Schema.
You need to be aware that this configuration only defines what data is to be included in the map file. How the data is eventually rendered is specified by a rule-set that is attached to the renderer. So if you add any tag to the writer’s tag configuration that is not recognized by the renderer, it will not be displayed in the map. In this case, you have to make sure that you also define in which way the new tag is to be rendered. How to configure the rendering is described in the article.
View
@@ -73,9 +73,9 @@ With everything set up you can check the 'POI search' example in Samples for:
If the provided category configuration does not fulfill your needs, you can easily create your own.
-The default internal poi mapping is defined in https://github.com/mapsforge/mapsforge/blob/dev/mapsforge-poi-writer/src/main/config/poi-mapping.xml. So if you want to define your own custom mapping, use the internal mapping as a reference.
+The default internal poi mapping is defined in https://github.com/mapsforge/mapsforge/blob/master/mapsforge-poi-writer/src/main/config/poi-mapping.xml. So if you want to define your own custom mapping, use the internal mapping as a reference.
-Please consult the XML-Schema documentation of https://github.com/mapsforge/mapsforge/blob/dev/resources/poi-mapping.xsd to learn about how to implement your custom mapping. The XML-Schema is very easy to understand. We recommend to use a proper editor for XML to allow auto-completion and validation if you provide an XML-Schema.
+Please consult the XML-Schema documentation of https://github.com/mapsforge/mapsforge/blob/master/resources/poi-mapping.xsd to learn about how to implement your custom mapping. The XML-Schema is very easy to understand. We recommend to use a proper editor for XML to allow auto-completion and validation if you provide an XML-Schema.
### Filtered Search
View
@@ -33,7 +33,7 @@ Here is an example of a simple render-theme with a few different rules and rende
</rendertheme>
```
-Syntax and semantics of render-theme files are similar but not identical to [Osmarender rule files](http://wiki.openstreetmap.org/wiki/Osmarender/Rules). A formal render-theme description exists as an *XML schema document*, it can be found in the [repository](https://github.com/mapsforge/mapsforge/blob/dev/resources/renderTheme.xsd). If an invalid render-theme is submitted to the map library, an `org.xml.sax.SAXException` will be thrown during XML parsing.
+Syntax and semantics of render-theme files are similar but not identical to [Osmarender rule files](http://wiki.openstreetmap.org/wiki/Osmarender/Rules). A formal render-theme description exists as an *XML schema document*, it can be found in the [repository](https://github.com/mapsforge/mapsforge/blob/master/resources/renderTheme.xsd). If an invalid render-theme is submitted to the map library, an `org.xml.sax.SAXException` will be thrown during XML parsing.
## Rules
@@ -95,7 +95,7 @@ With mapsforge release 0.5, we introduce the enhanced **Rendertheme V4 XML** wit
Rendertheme V4 or newer remains **fully backward compatible** with version 3, meaning that any previously developed rendertheme definition will still render with V4 without any changes required (you do not even need to change the version number in the header).
-You can find the full xsd in the mapsforge repository at https://github.com/mapsforge/mapsforge/blob/dev/resources/renderTheme-v5.xsd.
+You can find the full xsd in the mapsforge repository at https://github.com/mapsforge/mapsforge/blob/master/resources/renderTheme-v5.xsd.
But if you want to develop your renderthemes further, Rendertheme V4 offers a number of enhancements. If you want to make use of the new features, you will first need to set your rendertheme version in the header to 4 or newer:
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tag-mapping xmlns="http://mapsforge.org/tag-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapsforge.org/tag-mapping https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/tag-mapping.xsd"
+ xsi:schemaLocation="http://mapsforge.org/tag-mapping https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/tag-mapping.xsd"
default-zoom-appear="16" profile-name="default-profile">
<!-- ************* POIS *************** -->
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tag-mapping xmlns="http://mapsforge.org/tag-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapsforge.org/tag-mapping https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/tag-mapping.xsd"
+ xsi:schemaLocation="http://mapsforge.org/tag-mapping https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/tag-mapping.xsd"
default-zoom-appear="16" profile-name="default-profile">
<!-- ************* POIS *************** -->
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<rendertheme xmlns="http://mapsforge.org/renderTheme"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/renderTheme-v4.xsd"
+ xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/renderTheme-v4.xsd"
version="4" map-background="#f8f8f8" map-background-outside="#dddddd">
<rule e="way" k="natural" v="issea|sea">
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<category xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" title="root"
xmlns="http://mapsforge.org/poi-mapping"
- xsi:schemaLocation="http://mapsforge.org/poi-mapping https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/poi-mapping.xsd">
+ xsi:schemaLocation="http://mapsforge.org/poi-mapping https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/poi-mapping.xsd">
<!-- http://wiki.openstreetmap.org/wiki/Map_Features -->
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<rendertheme xmlns="http://mapsforge.org/renderTheme"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/renderTheme.xsd"
+ xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/renderTheme.xsd"
version="3" map-background="#00000000">
<rule e="way" k="building" v="*">
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<rendertheme xmlns="http://mapsforge.org/renderTheme"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/renderTheme-v4.xsd"
+ xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/renderTheme-v4.xsd"
version="4" map-background="#F8F8F8" map-background-outside="#DDDDDD">
<stylemenu id="r4menu" defaultvalue="standard" defaultlang="en">
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<rendertheme xmlns="http://mapsforge.org/renderTheme"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/renderTheme-v5.xsd"
+ xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/renderTheme-v5.xsd"
version="5" map-background="#F8F8F8" map-background-outside="#DDDDDD">
<stylemenu id="r4menu" defaultvalue="standard" defaultlang="en">
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<rendertheme xmlns="http://mapsforge.org/renderTheme"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/renderTheme.xsd"
+ xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/renderTheme.xsd"
version="3" map-background="#f8f8f8">
<!-- ways -->
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<rendertheme xmlns="http://mapsforge.org/renderTheme"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/dev/resources/renderTheme.xsd"
+ xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/renderTheme.xsd"
version="3" map-background="#00000000">
<!-- ways -->

0 comments on commit bc60820

Please sign in to comment.