kopia lustrzana https://github.com/JOSM/MapWithAI
Modify files for namespace change and plugin name change
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>pull/1/head v0.1.2
rodzic
0f4cf3414d
commit
47ec11ba4b
|
@ -133,7 +133,7 @@ build with java 13:
|
|||
# stage: deploy
|
||||
# environment:
|
||||
# name: transifex
|
||||
# url: https://www.transifex.com/josm/josm/josm-plugin_rapid/
|
||||
# url: https://www.transifex.com/josm/josm/josm-plugin_mapwithai/
|
||||
# before_script:
|
||||
# - apt-get update && apt-get install -yq gettext git
|
||||
# - pip install git+https://github.com/transifex/transifex-client.git
|
||||
|
@ -142,18 +142,18 @@ build with java 13:
|
|||
# dependencies:
|
||||
# - build
|
||||
# only:
|
||||
# - master@smocktaylor/rapid
|
||||
# - master@gokaart/JOSM_MapWithAI
|
||||
|
||||
release:
|
||||
stage: deploy
|
||||
environment:
|
||||
name: pages branch / dist directory
|
||||
url: https://gitlab.com/smocktaylor/rapid/tree/pages/public/dist
|
||||
url: https://gitlab.com/gokaart/JOSM_MapWithAI/tree/pages/public/dist
|
||||
script:
|
||||
- &clone_pages_branch |
|
||||
echo "$SSH_PRIVATE_DEPLOY_KEY" > ~/.ssh/id_rsa
|
||||
chmod 600 ~/.ssh/id_rsa
|
||||
git clone --depth 1 --branch pages git@gitlab.com:smocktaylor/rapid.git pages
|
||||
git clone --depth 1 --branch pages git@gitlab.com:gokaart/JOSM_MapWithAI.git pages
|
||||
- |
|
||||
version=`git describe --always --dirty`
|
||||
longVersion=`git describe --always --long --dirty`
|
||||
|
@ -166,20 +166,20 @@ release:
|
|||
- &push_pages_branch |
|
||||
cd pages/
|
||||
git config user.name "Deploy with GitLab CI"
|
||||
git config user.email "smocktaylor/rapid@gitlab.com"
|
||||
git config user.email "gokaart/JOSM_MapWithAI@gitlab.com"
|
||||
git stage .
|
||||
git commit -a -m "$commitMessage"
|
||||
git push origin pages
|
||||
dependencies:
|
||||
- build
|
||||
only:
|
||||
- tags@smocktaylor/rapid
|
||||
- tags@gokaart/JOSM_MapWithAI
|
||||
|
||||
publish master update site:
|
||||
stage: deploy
|
||||
environment:
|
||||
name: pages branch / snapshot update site
|
||||
url: https://gitlab.com/smocktaylor/rapid/tree/pages
|
||||
url: https://gitlab.com/gokaart/JOSM_MapWithAI/tree/pages
|
||||
script:
|
||||
- *clone_pages_branch
|
||||
- |
|
||||
|
@ -194,16 +194,16 @@ publish master update site:
|
|||
dependencies:
|
||||
- build
|
||||
only:
|
||||
- master@smocktaylor/rapid
|
||||
- master@gokaart/JOSM_MapWithAI
|
||||
|
||||
publish to / GitLab.com packages:
|
||||
stage: deploy
|
||||
environment:
|
||||
name: GitLab.com / JOSM-rapid packages
|
||||
url: https://gitlab.com/smocktaylor/rapid/-/packages
|
||||
name: GitLab.com / JOSM-MapWithAI packages
|
||||
url: https://gitlab.com/gokaart/JOSM_MapWithAI/-/packages
|
||||
script:
|
||||
- ./gradlew publishPluginPublicationToGitlabRepository
|
||||
dependencies:
|
||||
- build
|
||||
only:
|
||||
- tags@smocktaylor/rapid
|
||||
- tags@gokaart/JOSM_MapWithAI
|
||||
|
|
12
README.md
12
README.md
|
@ -1,7 +1,7 @@
|
|||
# JOSM MapWithAI Plugin (formerly RapiD Plugin)
|
||||
|
||||
[![pipeline status](https://gitlab.com/smocktaylor/rapid/badges/master/pipeline.svg)](https://gitlab.com/smocktaylor/rapid/commits/master)
|
||||
[![code coverage](https://gitlab.com/smocktaylor/rapid/badges/master/coverage.svg)](https://codecov.io/github/smocktaylor/rapid?branch=master)
|
||||
[![pipeline status](https://gitlab.com/gokaart/JOSM_MapWithAI/badges/master/pipeline.svg)](https://gitlab.com/gokaart/JOSM_MapWithAI/commits/master)
|
||||
[![code coverage](https://gitlab.com/gokaart/JOSM_MapWithAI/badges/master/coverage.svg)](https://codecov.io/github/gokaart/JOSM_MapWithAI?branch=master)
|
||||
[![license](https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square)](./LICENSE)
|
||||
|
||||
This plugin brings MapWithAI information into JOSM.
|
||||
|
@ -21,18 +21,18 @@ To use this plugin, [install JOSM](https://josm.openstreetmap.de/wiki/Download)
|
|||
|
||||
### Optional JOSM Setup
|
||||
1. Open JOSM
|
||||
2. Add the "MapWithAI" paintstyle by going to "Map Settings" -> "Map Paint Styles" -> the plus sign next to "Active styles" -> enter `https://gitlab.com/smocktaylor/rapid/raw/master/src/resources/styles/standard/rapid.mapcss` in the "URL / File" field.
|
||||
2. Add the "MapWithAI" paintstyle by going to "Map Settings" -> "Map Paint Styles" -> the plus sign next to "Active styles" -> enter `https://gitlab.com/gokaart/JOSM_MapWithAI/raw/master/src/resources/styles/standard/mapwithai.mapcss` in the "URL / File" field.
|
||||
|
||||
## Information
|
||||
* [RapiD](https://mapwith.ai/rapid)
|
||||
* [HOT Tasking Manager + RapiD] (https://tasks-assisted.hotosm.org/)
|
||||
* [HOT Tasking Manager + RapiD](https://tasks-assisted.hotosm.org/)
|
||||
* [RapiD source code and country requests](https://github.com/facebookincubator/RapiD)
|
||||
* [mapwith.ai](https://mapwith.ai/)
|
||||
|
||||
## Contributing
|
||||
|
||||
- The **source code** is hosted on [GitLab](https://gitlab.com/smocktaylor/rapid).
|
||||
- **Issues** are managed in [GitLab](https://gitlab.com/smocktaylor/rapid/issues)
|
||||
- The **source code** is hosted on [GitLab](https://gitlab.com/gokaart/JOSM_MapWithAI).
|
||||
- **Issues** are managed in [GitLab](https://gitlab.com/gokaart/JOSM_MapWithAI/issues)
|
||||
- **Translations** are not currently done.
|
||||
|
||||
## Authors
|
||||
|
|
|
@ -106,7 +106,7 @@ tasks.processResources {
|
|||
archivesBaseName = "mapwithai"
|
||||
josm {
|
||||
i18n {
|
||||
pathTransformer = getPathTransformer("gitlab.com/smocktaylor/rapid/blob")
|
||||
pathTransformer = getPathTransformer("gitlab.com/gokaart/JOSM_MapWithAI/blob")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -159,7 +159,7 @@ task generateSnapshotUpdateSite(type: GeneratePluginList) {
|
|||
outputFile = new File(project.buildDir, "snapshot-update-site")
|
||||
versionSuffix = {a -> ""}
|
||||
doFirst {
|
||||
def pluginDownloadUrl = "https://smocktaylor.gitlab.io/$archivesBaseName/snapshot/master/${archivesBaseName}.jar"
|
||||
def pluginDownloadUrl = "https://gokaart.gitlab.io/$archivesBaseName/snapshot/master/${archivesBaseName}.jar"
|
||||
it.iconBase64Provider = {
|
||||
def file = new File(sourceSets.main.resources.srcDirs[0], it)
|
||||
if (file.exists()) {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<ruleset name="Ruleset for josm-rapid-plugin"
|
||||
<ruleset name="Ruleset for josm-mapwithai-plugin"
|
||||
xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
|
||||
|
|
|
@ -5,10 +5,10 @@ plugin.main.version = 15233
|
|||
# The special values "latest" and "tested" are also possible here, but not recommended.
|
||||
plugin.compile.version = 15233
|
||||
plugin.canloadatruntime = true
|
||||
plugin.author = Taylor Smock <incoming+smocktaylor/rapid@incoming.gitlab.com>
|
||||
plugin.author = Taylor Smock <incoming+gokaart/JOSM_MapWithAI@incoming.gitlab.com>
|
||||
plugin.class = org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin
|
||||
#plugin.icon = images/dialogs/rapid.svg
|
||||
plugin.link = https://gitlab.com/smocktaylor/rapid
|
||||
plugin.link = https://gitlab.com/gokaart/JOSM_MapWithAI
|
||||
plugin.description = Allows the use of MapWithAI data in JOSM (same data as used in RapiD) (currently VERY rudimentary)
|
||||
|
||||
# This is due to changing the name of the plugin
|
||||
|
|
|
@ -309,7 +309,7 @@ public final class MapWithAIDataUtils {
|
|||
public static void addMapWithAIPaintStyles() {
|
||||
// TODO figure out how to use the one in the jar file
|
||||
final ExtendedSourceEntry mapWithAI = new ExtendedSourceEntry(SourceType.MAP_PAINT_STYLE, "mapwithai.mapcss",
|
||||
"https://gitlab.com/smocktaylor/rapid/raw/master/src/resources/styles/standard/mapwithai.mapcss");
|
||||
"https://gitlab.com/gokaart/JOSM_MapWithAI/raw/master/src/resources/styles/standard/mapwithai.mapcss");
|
||||
final List<SourceEntry> paintStyles = MapPaintPrefHelper.INSTANCE.get();
|
||||
for (final SourceEntry paintStyle : paintStyles) {
|
||||
if (mapWithAI.url.equals(paintStyle.url)) {
|
||||
|
|
Ładowanie…
Reference in New Issue