WIP

.env

@@ -0,0 +1,2 @@
+export BUILDPACK_URL=https://github.com/florianheinemann/buildpack-nginx.git
+

.gitignore

@@ -6,3 +6,4 @@ dist/iD.css
 dist/presets.js
 dist/imagery.js
 transifex.auth
+*.sw?

Makefile

@@ -20,6 +20,7 @@ dist/iD.js: \
 	js/lib/bootstrap-tooltip.js \
 	js/lib/d3.v3.js \
 	js/lib/d3.combobox.js \
+	js/lib/d3.mcombobox.js \
 	js/lib/d3.geo.tile.js \
 	js/lib/d3.jsonp.js \
 	js/lib/d3.keybinding.js \

README.md

@@ -1,36 +1,29 @@
-# iD - friendly JavaScript editor for [OpenStreetMap](http://www.openstreetmap.org/)
-
-[![Build Status](https://secure.travis-ci.org/openstreetmap/iD.png)](https://travis-ci.org/openstreetmap/iD)
+# iD - friendly JavaScript editor for [TransforMap](http://transformap.co/)
 
 ## Basics
 
-* iD is a JavaScript [OpenStreetMap](http://www.openstreetmap.org/) editor.
-* It's intentionally simple. It lets you do the most basic tasks while
-  not breaking other people's data.
-* It supports modern browsers. Data is rendered with [d3](http://d3js.org/).
+* iD is a JavaScript [OpenStreetMap](http://www.openstreetmap.org/) editor, adapted for TransforMap.
+* It's latest stable release is deployed on [http://editor.transformap.co](editor.transformap.co)
 
 ## Participate!
 
-* [Try out the latest stable release](http://openstreetmap.us/iD/release)
-* [Read up on Contributing and the code style of iD](CONTRIBUTING.md)
-* See [open issues in the issue tracker](https://github.com/openstreetmap/iD/issues?state=open) if you're looking for something to do
-* [Translate!](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)
-
-[![translation chart](https://www.transifex.com/projects/p/id-editor/chart/image_png)](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)
-## Installation
-
-To run the current development version, fork this project and serve it locally.
-If you have Python handy, just `cd` into the project root directory and run
-
-     python -m SimpleHTTPServer
+* Get in touch with TransforMap's techie circle here [on Discourse](http://discourse.transformap.co/c/engineering).
+* See [open issues in the issue tracker](https://github.com/TransforMap/iD/issues?state=open) if you're looking for something to do
 
-Or, with a Mac, you can enable Web Sharing and clone iD into your website directory.
+## Developing
 
-Come on in, the water's lovely. More help? Ping tmcw, jfire, or bhousel on IRC
-(`irc.oftc.net`, in `#osm-dev` or `#osm`) or on the OSM mailing lists.
+If you want to deploy a new version on editor.transformap.co:
 
-For guidance on building a packaged version, running tests, and contributing to
-development, see [CONTRIBUTING.md](CONTRIBUTING.md).
+* Get an account, ask here on [Discourse](http://discourse.transformap.co/t/id-editor-deployment-coordination/366/6).
+* clone this or a fork
+* edit
+* call "make", your changes get compiled into dist/
+* check out the "dist" branch: "git checkout dist"
+* the "dist" branch is simply a copy of the "dist/"-folder with compiled source
+* copy all files from dist/ into the /-folder of the "dist"-branch, commit.
+* git remote add update dokku@apps.ecobytes.net:id (needed only 1st time)
+* git push --set-upstream origin dist (needed only 1st time)
+* git push update dist:master
 
 ## License
 

TODO.transformap

@@ -0,0 +1,69 @@
+beginners mode mit gruen leuchtenden knoepfen, wo er der reihenfolge nach drücken muss
+        1. locate me
+        2. set point
+        3. click here to set a name
+        4. click here to set needs, identity, interaction
+
+
+which tags should be supported on default?
+
+name, description
+addr
+provides/topic
+identity
+interaction
+
+sed -i 's/"fields": \[/"fields": \[ \n        "provides",\n        "topic",\n        "identity",\n        "interaction",/' *
+sed -i 's/"fields": \[/"fields": \[ \n        "provides",\n        "identity",\n        "interaction",/'
+
+add vertex for:
+sed -i 's/"point",/"point",\n        "vertex",/' 
+
+extra fields:
+  contact data -OK
+  smoking -OK
+  wheelchair -OK
+  start_date -OK
+  fee -OK
+  access (members/public)
+  internet access -OK
+
+  organic -OK
+  regional -OK
+  fair_trade -OK
+
+  POI-Typen... (amenity,shop,landuse,club,...)
+
+  1st "Screen": 
+    • TransforMap Taxonomy
+      → guided Tour
+    • Classic OSM Object
+      → conventional things
+
+Todo:
+  how are translations handled?
+  default length of dropdown 4 → 8? -OK
+
+how to set "Main Tag" in OSM?
+
+Remove "Tutorial" questions, or replace with TransforMap tutorial
+
+Future:
+  Quick "Switch to OSM Mode" with full features
+  Photo upload - ends on other server (mediawiki?), sets link as "image" tag
+  adding of Events - ends on other server
+
+
+new presets needed
+  Tausch&Schenkregal (givebox) -> amenity=givebox -OK
+  Volkskueche -OK
+  csa-abholpunkt -OK
+  food-coop -OK
+
+todo: add all "club"
+  office=ngo
+
+
+bug:
+  if you forget the "category-" prefix when adding them to defaults.json, the JS throws an error.
+  amenity/doctor is inconsistent, should be doctors

build.js

@@ -177,8 +177,6 @@ function validateCategoryPresets(categories, presets) {
 }
 
 function validatePresetFields(presets, fields) {
-    var presets = rp('presets.json'),
-        fields = rp('fields.json');
     _.forEach(presets, function(preset) {
         if (preset.fields) {
             preset.fields.forEach(function(field) {

css/app.css

@@ -27,8 +27,11 @@ body {
 }
 
 .id-container {
-    height: 100%;
+    /* height: 100%; */
+    top:50px;
+    bottom:0;
     width: 100%;
+    position: absolute;
     position: fixed;
     min-width: 768px;
 }
@@ -606,7 +609,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     position: fixed;
     padding: 10px 0;
     left:0;
-    top:0;
+    top:50px;
     right:0;
     height:60px;
     z-index: 9;
@@ -1463,10 +1466,10 @@ input[type=number] {
 div.combobox {
     z-index: 9999;
     display: none;
-    box-shadow: 0 0 10px 0 rgba(0,0,0,.1);
+    box-shadow: 0px 8px 10px 0px rgba(0,0,0,0.5);
     margin-top: -1px;
     background: white;
-    max-height: 120px;
+    max-height: 220px;
     overflow-y: auto;
     overflow-x: hidden;
     border: 1px solid #ccc;
@@ -1482,7 +1485,14 @@ div.combobox {
     overflow: hidden;
 }
 
-.combobox a.selected,
+.combobox a.mcombobox-option span {
+    padding-left: 10px;
+}
+
+.combobox a.selected {
+    font-weight: 600;
+}
+
 .combobox a:hover {
     background: #ececec;
 }
@@ -1724,7 +1734,7 @@ img.wiki-image {
 
 .map-controls {
     right: 0;
-    top: 70px;
+    top: 120px;
     width: 40px;
     position: fixed;
     z-index: 100;
@@ -2991,3 +3001,85 @@ img.wiki-image {
     background: rgba(0, 0, 0, 0) url(img/sprite.svg) no-repeat -400px -220px;
     margin: auto;
 }
+
+.mcombo {
+    display: inline-block;
+    font-size: inherit;
+    text-rendering: auto;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    transform: translate(0, 0);
+}
+.mcombo.square:before {
+    content: "\2610";
+}
+.mcombo.check-square:before {
+  content: "\2611";
+  font-weight:normal;
+}
+
+.mmmnavbar {
+  font-size: 14px;
+  background: #455473;
+  box-shadow: #AAAAAA 0px 3px 5px 0px;
+  height: 50px;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  z-index:1005;
+  color:#FFF;
+  font: normal normal 400 14px/20px "PT Sans";
+  font-family: "PT Sans", sans-serif;
+  vertical-align:middle;
+  text-align:center;
+}
+
+.mmmnavbar li a {
+  color: #DDDDDD;
+  height:100%;
+  display:block;
+  line-height:50px;
+  padding-left:10px;
+  padding-right:10px;
+}
+.mmmnavbar li:first-child a {
+padding:0px;
+}
+
+
+.mmmnavbar a:hover {
+  text-decoration: none;
+  color:#FFF;
+}
+
+.mmmnavbar ul {
+    max-width:939px;
+    margin:0 0 0 -470px;
+    padding:0;
+    position:absolute;
+    top:0px;
+    left:50%;
+    height:50px;
+}
+
+.mmmnavbar ul li {
+  display: inline;
+  float:left;
+  height:50px;
+  /*padding:10px;*/
+}
+.mmmnavbar ul li:first-child {
+    float:normal;
+}
+
+.mmmnavbar ul li img {
+    vertical-align:middle;
+    margin:10px;
+}
+
+.mmmnavbar ul li:hover {
+  background: #444;
+}
+
+