Update to iD v1.8.2

[rails.git] / vendor / assets / iD / iD / locales / zh-CN.json

diff --git a/vendor/assets/iD/iD/locales/zh-CN.json b/vendor/assets/iD/iD/locales/zh-CN.json
index e3b45f21add5f8263a088a455944ddf073a0b2e3..bcd08cf957b9ce67a724bcdd7a31b5fd095e29af 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -1,9 +1,9 @@
 {
     "modes": {
         "add_area": {
 {
     "modes": {
         "add_area": {

-            "title": "区域",
-            "description": "添加公园、建筑、湖或其它区域到地图上。",
-            "tail": "在地图上单击开始绘制区域，如公园、湖泊或建筑物。"
+            "title": "面",
+            "description": "添加公园、建筑物、湖或其它面状要素到地图上。",
+            "tail": "在地图上单击开始绘制面状要素，如公园、湖泊或建筑物。"

         },
         "add_line": {
             "title": "线",
         },
         "add_line": {
             "title": "线",


@@ -37,7 +37,7 @@
         "start": {
             "annotation": {
                 "line": "开始绘制线。",
         "start": {
             "annotation": {
                 "line": "开始绘制线。",

-                "area": "开始绘制区域。"
+                "area": "开始绘制面状要素。"

             }
         },
         "continue": {
             }
         },
         "continue": {


@@ -45,17 +45,17 @@
             "title": "继续",
             "description": "继续绘制这条线。",
             "not_eligible": "这里没有线可以在继续。",
             "title": "继续",
             "description": "继续绘制这条线。",
             "not_eligible": "这里没有线可以在继续。",

-            "multiple": "å\8f¯ä»¥é\80\89æ\8b©å¤\9aæ\9d¡çº¿ã\80\82è¦\81å¢\9eå\8a é\80\89æ\8b©ä¸\80æ\9d¡ç\9b´çº¿，按住Shift键并单击以选中它。",
+            "multiple": "å¤\9aæ\9d¡çº¿å\8f¯ä»¥å\9c¨æ­¤å»¶é\95¿ã\80\82è¦\81é\80\89å®\9aå\85¶ä¸­ä¸\80æ\9d¡，按住Shift键并单击以选中它。",

             "annotation": {
                 "line": "继续绘制线。",
             "annotation": {
                 "line": "继续绘制线。",

-                "area": "继续绘制区域。"
+                "area": "继续绘制面状要素。"

             }
         },
         "cancel_draw": {
             "annotation": "取消绘制。"
         },
         "change_role": {
             }
         },
         "cancel_draw": {
             "annotation": "取消绘制。"
         },
         "change_role": {

-            "annotation": "已更改关系成员的角色。"
+            "annotation": "更改关系成员的定位。"

         },
         "change_tags": {
             "annotation": "更改标签。"
         },
         "change_tags": {
             "annotation": "更改标签。"


@@ -64,47 +64,54 @@
             "title": "环形化",
             "description": {
                 "line": "环形化该线。",
             "title": "环形化",
             "description": {
                 "line": "环形化该线。",

-                "area": "环形化该区域。"
+                "area": "环形化该面状要素。"

             },
             "key": "O",
             "annotation": {
                 "line": "环形化线。",
             },
             "key": "O",
             "annotation": {
                 "line": "环形化线。",

-                "area": "环形化区域。"
+                "area": "环形化面要素。"

             },
             },

-            "not_closed": "非圈状物件，不能环形化。"
+            "not_closed": "它不是闭合的环形，无法圆形化。",
+            "too_large": "因为可见部分不足，不能变成圆形。",
+            "connected_to_hidden": "该对象无法环形化，因为其与一隐藏要素相连。"

         },
         "orthogonalize": {
             "title": "直角化",
             "description": {
                 "line": "将这条线上的弯角转化成直角。",
         },
         "orthogonalize": {
             "title": "直角化",
             "description": {
                 "line": "将这条线上的弯角转化成直角。",

-                "area": "将这个区域上的弯角转化成直角。"
+                "area": "将这个面状要素上的弯角转化成直角。"

             },
             "key": "S",
             "annotation": {
                 "line": "拉直线上角的边。",
             },
             "key": "S",
             "annotation": {
                 "line": "拉直线上角的边。",

-                "area": "已将区域的弯角换成直角。"
+                "area": "已将面要素的弯角换成直角。"

             },
             },

-            "not_squarish": "因为它不是近似方形的，这不能被直角化。"
+            "not_squarish": "因为它不是近似方形的，这不能被直角化。",
+            "too_large": "因为可见部分不足，不能变成方形。",
+            "connected_to_hidden": "该对象无法直角化，因为其与一隐藏要素相连。"

         },
         "straighten": {
             "title": "拉直",
             "description": "把这一条线拉直。",
             "key": "S",
         },
         "straighten": {
             "title": "拉直",
             "description": "把这一条线拉直。",
             "key": "S",

-            "annotation": "已拉直了一条线。",
-            "too_bendy": "因为它弯曲太多，不能拉直。"
+            "annotation": "拉直线。",
+            "too_bendy": "因为它弯曲太多，不能拉直。",
+            "connected_to_hidden": "该线不能取直，因为其与一隐藏要素相连。"

         },
         "delete": {
             "title": "删除",
         },
         "delete": {
             "title": "删除",

-            "description": "从地图上删除。",
+            "description": "彻底删除对象。",

             "annotation": {
                 "point": "删除点。",
                 "vertex": "删除路径上的节点。",
                 "line": "删除线。",
             "annotation": {
                 "point": "删除点。",
                 "vertex": "删除路径上的节点。",
                 "line": "删除线。",

-                "area": "删除区域。",
+                "area": "删除面状要素。",

                 "relation": "删除关系。",
                 "multiple": "删除{n}个对象。"
             },
                 "relation": "删除关系。",
                 "multiple": "删除{n}个对象。"
             },

-            "incomplete_relation": "此内容暂未下载完成无法删除。"
+            "incomplete_relation": "此内容暂未下载完成无法删除。",
+            "part_of_relation": "无法删除该要素，因为它是更大的关系的一部分。必须先将其从关系中移除。",
+            "connected_to_hidden": "无法删除，因为其与一隐藏要素相连。"

         },
         "add_member": {
             "annotation": "增加关系中的成员。"
         },
         "add_member": {
             "annotation": "增加关系中的成员。"


@@ -114,40 +121,40 @@
         },
         "connect": {
             "annotation": {
         },
         "connect": {
             "annotation": {

-                "point": "连接条路径到点。",
-                "vertex": "连接两条路径。",
+                "point": "连接路径到点。",
+                "vertex": "连接路径到另一路径。",

                 "line": "连接路径到线。",
                 "line": "连接路径到线。",

-                "area": "连接条路径到区域。"
+                "area": "连接条线要素到面要素。"

             }
         },
         "disconnect": {
             "title": "断开连接",
             }
         },
         "disconnect": {
             "title": "断开连接",

-            "description": "断开这些线/区域之间的连接。",
+            "description": "断开这些线/面之间的连接。",

             "key": "D",
             "key": "D",

-            "annotation": "断开线/区域连接。",
-            "not_connected": "没有足够的线/面来断开。"
+            "annotation": "断开线/面连接。",
+            "not_connected": "没有足够的线/面来断开。",
+            "connected_to_hidden": "无法断开连接，因为其与一隐藏要素相连。"

         },
         "merge": {
             "title": "合并",
         },
         "merge": {
             "title": "合并",

-            "description": "合并这些线。",

             "key": "C",
             "key": "C",

-            "annotation": "合并了 {n} 条线。",
-            "not_eligible": "这些要素不能被合并。",
-            "not_adjacent": "这些线段并不连接，不能合并。",
-            "restriction": "这些线段不能合并，因为其中最少有一条线段是\"{relation}\"关系的成员。"
+            "not_eligible": "这些特征不可以合并。",
+            "incomplete_relation": "此要素暂未下载完成，无法合并。"

         },
         "move": {
             "title": "移动",
             "description": "移动到不同的位置。",
             "key": "M",
             "annotation": {
         },
         "move": {
             "title": "移动",
             "description": "移动到不同的位置。",
             "key": "M",
             "annotation": {

-                "point": "移动了一个点。",
-                "vertex": "移动了路径中的一个节点。",
+                "point": "移动点。",
+                "vertex": "移动路径中节点。",

                 "line": "移动线。",
                 "line": "移动线。",

-                "area": "移动区域。",
+                "area": "移动面状要素。",

                 "multiple": "移动多个对象。"
             },
                 "multiple": "移动多个对象。"
             },

-            "incomplete_relation": "此要素暂未下载完成，无法删除。"
+            "incomplete_relation": "该特征还没有下载完整，无法移动。",
+            "too_large": "因为可见部分不足，不能移动。",
+            "connected_to_hidden": "无法移动，因为其与一隐藏要素相连。"

         },
         "rotate": {
             "title": "旋转",
         },
         "rotate": {
             "title": "旋转",


@@ -155,8 +162,10 @@
             "key": "R",
             "annotation": {
                 "line": "旋转线。",
             "key": "R",
             "annotation": {
                 "line": "旋转线。",

-                "area": "旋转区域。"
-            }
+                "area": "旋转面状要素。"
+            },
+            "too_large": "因为可见部分不足，不能旋转。",
+            "connected_to_hidden": "无法旋转，因为其与一隐藏要素相连。"

         },
         "reverse": {
             "title": "反转",
         },
         "reverse": {
             "title": "反转",


@@ -174,23 +183,35 @@
             "key": "X",
             "annotation": {
                 "line": "切割一条线。",
             "key": "X",
             "annotation": {
                 "line": "切割一条线。",

-                "area": "分割一区域的边界。",
-                "multiple": "分割{n}的项线段/区域的边界。"
+                "area": "分割面要素的边界。",
+                "multiple": "分割{n}项线段/面的边界。"

             },
             "not_eligible": "不能在线段的首尾进行分割。",
             },
             "not_eligible": "不能在线段的首尾进行分割。",

-            "multiple_ways": "太多线段，未能进行分割。"
+            "multiple_ways": "太多线段，未能进行分割。",
+            "connected_to_hidden": "无法打断，因为其与一隐藏要素相连。"
+        },
+        "restriction": {
+            "help": {
+                "select": "单击以选中一条路。",
+                "toggle": "点击切换转向限制。",
+                "toggle_on": "单击以添加一个\"{restriction}\"限制。",
+                "toggle_off": "单击以删除一个\"{restriction}\"限制。"
+            },
+            "annotation": {
+                "create": "添加转向限制",
+                "delete": "删除转向限制"
+            }

         }
     },
     "undo": {
         "tooltip": "撤销：{action}",
         }
     },
     "undo": {
         "tooltip": "撤销：{action}",

-        "nothing": "没有东西可以撤销。"
+        "nothing": "没有可以撤销的操作。"

     },
     "redo": {
         "tooltip": "重做：{action}",
     },
     "redo": {
         "tooltip": "重做：{action}",

-        "nothing": "没有东西可以重做。"
+        "nothing": "没有可以重做的操作。"

     },
     "tooltip_keyhint": "快捷键：",
     },
     "tooltip_keyhint": "快捷键：",

-    "browser_notice": "本编辑器仅被 Firefox、Chrome、Safari、Opera 和 Internet Explorer 9 以上所支持。请升级您的浏览器或使用 Potlatch 2 来编辑地图。",

     "translate": {
         "translate": "翻译",
         "localized_translation_label": "多语言名称",
     "translate": {
         "translate": "翻译",
         "localized_translation_label": "多语言名称",


@@ -200,7 +221,10 @@
     "zoom_in_edit": "放大地图以编辑",
     "logout": "退出",
     "loading_auth": "正在连接OpenStreetMap...",
     "zoom_in_edit": "放大地图以编辑",
     "logout": "退出",
     "loading_auth": "正在连接OpenStreetMap...",

-    "report_a_bug": "报告漏洞",
+    "feature_info": {
+        "hidden_warning": "{count}个隐藏特征",
+        "hidden_details": "以下要素目前被隐藏：{details}"
+    },

     "status": {
         "error": "无法连接到 API。",
         "offline": "API 已下线，请稍后再尝试编辑。",
     "status": {
         "error": "无法连接到 API。",
         "offline": "API 已下线，请稍后再尝试编辑。",


@@ -209,11 +233,12 @@
     "commit": {
         "title": "保存变更",
         "description_placeholder": "简单说明你的贡献。",
     "commit": {
         "title": "保存变更",
         "description_placeholder": "简单说明你的贡献。",

-        "message_label": "提交信息",
+        "message_label": "修改集合注释",

         "upload_explanation": "你的修改将会在所有使用OpenStreetMap的数据的地图上看得见。",
         "upload_explanation_with_user": "{user}，你的修改将会在所有使用OpenStreetMap数据的地图上展现。",
         "save": "保存",
         "cancel": "取消",
         "upload_explanation": "你的修改将会在所有使用OpenStreetMap的数据的地图上看得见。",
         "upload_explanation_with_user": "{user}，你的修改将会在所有使用OpenStreetMap数据的地图上展现。",
         "save": "保存",
         "cancel": "取消",

+        "changes": "{count}个变更",

         "warnings": "警告",
         "modified": "已更改",
         "deleted": "已删除",
         "warnings": "警告",
         "modified": "已更改",
         "deleted": "已删除",


@@ -223,6 +248,26 @@
         "list": "{users}编辑",
         "truncated_list": "{users}及另外{count}人编辑"
     },
         "list": "{users}编辑",
         "truncated_list": "{users}及另外{count}人编辑"
     },

+    "infobox": {
+        "selected": "已选择{n}个",
+        "geometry": "几何",
+        "closed": "已关闭",
+        "center": "中心",
+        "perimeter": "周长",
+        "length": "长度",
+        "area": "面",
+        "centroid": "重心",
+        "location": "位置",
+        "metric": "公制",
+        "imperial": "英制"
+    },
+    "geometry": {
+        "point": "点",
+        "vertex": "顶点",
+        "line": "线",
+        "area": "面状要素",
+        "relation": "关系"
+    },

     "geocoder": {
         "search": "在全球搜索...",
         "no_results_visible": "在可见地图区域没有结果",
     "geocoder": {
         "search": "在全球搜索...",
         "no_results_visible": "在可见地图区域没有结果",


@@ -235,38 +280,120 @@
         "no_documentation_combination": "这个标签组合没有可用的说明",
         "no_documentation_key": "这个键值没有可用的说明",
         "show_more": "显示更多",
         "no_documentation_combination": "这个标签组合没有可用的说明",
         "no_documentation_key": "这个键值没有可用的说明",
         "show_more": "显示更多",

-        "view_on_osm": "å\9c¨openstreetmap.org中查看",
+        "view_on_osm": "å\9c¨openstreetmap.orgä¸\8a查看",

         "all_tags": "所有标签",
         "all_members": "所有成员",
         "all_relations": "所有关系",
         "new_relation": "新关系...",
         "all_tags": "所有标签",
         "all_members": "所有成员",
         "all_relations": "所有关系",
         "new_relation": "新关系...",

-        "role": "角色",
-        "choose": "选择标记内容种类。",
+        "role": "定位",
+        "choose": "选择特征类型",

         "results": "{search}有{n}个结果。",
         "reference": "在OpenStreetMap Wiki中查看",
         "results": "{search}有{n}个结果。",
         "reference": "在OpenStreetMap Wiki中查看",

-        "back_tooltip": "修改物件",
+        "back_tooltip": "变更特征",

         "remove": "删除",
         "search": "搜索",
         "multiselect": "选择项目",
         "unknown": "未知",
         "remove": "删除",
         "search": "搜索",
         "multiselect": "选择项目",
         "unknown": "未知",

-        "incomplete": "<未有下载>",
+        "incomplete": "<未下载>",

         "feature_list": "搜索特征",
         "edit": "编辑特征",
         "feature_list": "搜索特征",
         "edit": "编辑特征",

-        "none": "空",
+        "check": {
+            "yes": "是",
+            "no": "否"
+        },
+        "none": "无",

         "node": "节点",
         "way": "路径",
         "relation": "关系",
         "node": "节点",
         "way": "路径",
         "relation": "关系",

-        "location": "位置"
+        "location": "位置",
+        "add_fields": "添加字段："

     },
     "background": {
         "title": "背景",
         "description": "背景设置",
     },
     "background": {
         "title": "背景",
         "description": "背景设置",

-        "percent_brightness": "{opacity}%ä¸\8dé\80\8fæ\98\8e度",
-        "none": "空",
+        "percent_brightness": "{opacity}%亮度",
+        "none": "无",

         "custom": "自定义",
         "custom": "自定义",

+        "custom_button": "编辑自定义背景",

         "custom_prompt": "输入瓦片模板。Z/X/Y方案的有效标记是{z}，{x}，{y}，quadtile方案的有效标记是{u}。",
         "fix_misalignment": "修复对齐",
         "custom_prompt": "输入瓦片模板。Z/X/Y方案的有效标记是{z}，{x}，{y}，quadtile方案的有效标记是{u}。",
         "fix_misalignment": "修复对齐",

-        "reset": "重置"
+        "reset": "重置",
+        "minimap": {
+            "description": "小地图",
+            "tooltip": "显示一个大范围的地图来帮助定位当前显示的区域"
+        }
+    },
+    "map_data": {
+        "title": "地图数据",
+        "description": "地图数据",
+        "data_layers": "数据图层",
+        "fill_area": "填充面状要素",
+        "map_features": "地图特征",
+        "autohidden": "这些要素已被自动隐藏，因为屏幕中的要素过多。请放大再编辑。"
+    },
+    "feature": {
+        "points": {
+            "description": "点",
+            "tooltip": "兴趣点(POI)"
+        },
+        "major_roads": {
+            "description": "主要道路",
+            "tooltip": "公路，街道等。"
+        },
+        "minor_roads": {
+            "description": "次要道路",
+            "tooltip": "辅助道路，停车场通道，土路等。"
+        },
+        "paths": {
+            "description": "小路",
+            "tooltip": "人行道，步行道路，自行车道等。"
+        },
+        "buildings": {
+            "description": "建筑物",
+            "tooltip": "建筑物，遮蔽处，车库等。"
+        },
+        "landuse": {
+            "description": "土地利用要素",
+            "tooltip": "森林，农田，公园，居民地，商用地等。"
+        },
+        "boundaries": {
+            "description": "分界线",
+            "tooltip": "行政分界线"
+        },
+        "water": {
+            "description": "水体特征",
+            "tooltip": "河流，湖泊，池塘，盆地等。"
+        },
+        "rail": {
+            "description": "铁路要素",
+            "tooltip": "铁路"
+        },
+        "power": {
+            "description": "电力要素",
+            "tooltip": "输电线，发电厂，变电所等。"
+        },
+        "past_future": {
+            "description": "过去/未来",
+            "tooltip": "规划，在建，废弃，拆毁等。"
+        },
+        "others": {
+            "description": "其他",
+            "tooltip": "其他东西"
+        }
+    },
+    "area_fill": {
+        "wireframe": {
+            "description": "无填充（线框）",
+            "tooltip": "开启线框模式，以便看清背景影像。"
+        },
+        "partial": {
+            "description": "部分填充",
+            "tooltip": "仅在面的内部边界附近填充区域。（推荐初学者使用）"
+        },
+        "full": {
+            "description": "全部填充",
+            "tooltip": "面状要素以全部填充绘制。"
+        }

     },
     "restore": {
         "heading": "您有未保存的更改",
     },
     "restore": {
         "heading": "您有未保存的更改",


@@ -278,9 +405,33 @@
         "title": "保存",
         "help": "保存改变至OpenStreetMap，让其他用户可见。",
         "no_changes": "没有待保存变更。",
         "title": "保存",
         "help": "保存改变至OpenStreetMap，让其他用户可见。",
         "no_changes": "没有待保存变更。",

-        "error": "尝试保存时出错。",
+        "error": "尝试保存时发生错误。",
+        "status_code": "服务器返回的状态代码{code}",
+        "unknown_error_details": "请确保你连接到互联网。",

         "uploading": "正在向 OpenStreetMap 上传更改。",
         "uploading": "正在向 OpenStreetMap 上传更改。",

-        "unsaved_changes": "你有未保存变更"
+        "unsaved_changes": "你有未保存变更",
+        "conflict": {
+            "header": "调解编辑冲突",
+            "count": "第{num}处冲突，共{num}处",
+            "previous": "< 上一个",
+            "next": "下一个>",
+            "keep_local": "保留自己的编辑",
+            "keep_remote": "使用他人的编辑",
+            "restore": "还原",
+            "delete": "恢复被删除的内容",
+            "download_changes": "或者下载你的修改。",
+            "done": "所有冲突已调解！",
+            "help": "另一位用户修改了你刚刚修改的地图要素。\n点击下面条目查看冲突详情，并选择保留你自己的或者别人的修改。\n"
+        }
+    },
+    "merge_remote_changes": {
+        "conflict": {
+            "deleted": "该对象已被{user}删除。",
+            "location": "你和{user}同时移动了该对象。",
+            "nodelist": "你和{user}同时修改了节点。",
+            "memberlist": "你和{user}同时修改了关系成员。",
+            "tags": "你将<b>{tag}</b>标签改为\"{local}\"而{user}将其改为\"{remote}\"。"
+        }

     },
     "success": {
         "edited_osm": "编辑了 OSM！",
     },
     "success": {
         "edited_osm": "编辑了 OSM！",


@@ -292,7 +443,8 @@
         "help_html": "你的更新应该在几分钟后出现在“标准”图层上。其他图层和某些功能，可能需要更长的时间\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>详情</a>).\n"
     },
     "confirm": {
         "help_html": "你的更新应该在几分钟后出现在“标准”图层上。其他图层和某些功能，可能需要更长的时间\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>详情</a>).\n"
     },
     "confirm": {

-        "okay": "确定"
+        "okay": "确定",
+        "cancel": "取消"

     },
     "splash": {
         "welcome": "欢迎使用OpenStreetMap iD编辑器",
     },
     "splash": {
         "welcome": "欢迎使用OpenStreetMap iD编辑器",


@@ -313,10 +465,12 @@
     "validations": {
         "untagged_point": "未标记的点",
         "untagged_line": "未标记的线",
     "validations": {
         "untagged_point": "未标记的点",
         "untagged_line": "未标记的线",

-        "untagged_area": "未标记的区域",
+        "untagged_area": "未标记的面",

         "many_deletions": "您正在删除 {n} 个对象，您确定要这么做吗？这将会把它们从大家所见的 openstreetmap.org 地图上删除。",
         "many_deletions": "您正在删除 {n} 个对象，您确定要这么做吗？这将会把它们从大家所见的 openstreetmap.org 地图上删除。",

-        "tag_suggests_area": "标签{tag}表明线应该为区域，但它不是区域",
-        "untagged_tooltip": "选择一个用来描述{geometry}的要输类型。",
+        "tag_suggests_area": "标签{tag}表明线应该为面要素，但它不是面",
+        "untagged_point_tooltip": "选择该点的要素类型。",
+        "untagged_line_tooltip": "选择描述这条线的要素类型。",
+        "untagged_area_tooltip": "选择描述这个面的要素类型。",

         "deprecated_tags": "弃用标签：{tags}"
     },
     "zoom": {
         "deprecated_tags": "弃用标签：{tags}"
     },
     "zoom": {


@@ -324,58 +478,69 @@
         "out": "缩小"
     },
     "cannot_zoom": "在此模式下不能再缩小",
         "out": "缩小"
     },
     "cannot_zoom": "在此模式下不能再缩小",

+    "full_screen": "切换全屏",

     "gpx": {
         "local_layer": "本地GPX文件",
         "drag_drop": "拖放GPX文件到页面上，或按一下浏览按钮，",
         "zoom": "缩放到GPX轨迹",
         "browse": "浏览GPX文件"
     },
     "gpx": {
         "local_layer": "本地GPX文件",
         "drag_drop": "拖放GPX文件到页面上，或按一下浏览按钮，",
         "zoom": "缩放到GPX轨迹",
         "browse": "浏览GPX文件"
     },

+    "mapillary": {
+        "tooltip": "Mapillary的街道照片",
+        "title": "照片叠加层(Mapillary)",
+        "view_on_mapillary": "在Mapillary上查看这张图片"
+    },

     "help": {
         "title": "帮助",
     "help": {
         "title": "帮助",

+        "help": "#帮助\n\n这是一个免费且可编辑的世界地图[OpenStreetMap](http://www.openstreetmap.org/)\n的编辑器，你可以用它来增加和更新你所在地区的数据，\n为全世界将这个开源、开放数据的世界地图变得更好。\n\n你在这张地图上的编辑将会被使用OpenStreetMap的所有人看到。\n你需要[登录](https://www.openstreetmap.org/login)才能编辑。\n\n本编辑器名为[iD](http://ideditor.com/)，是一个[源码在GitHub上共享](https://github.com/openstreetmap/iD)\n的协作项目。\n",
+        "editing_saving": "# 编辑和保存\n\n本编辑器为在线编辑设计，您正在经由本网站使用它。\n\n### 选择要素\n\n您可以在地图上单击以选中一个要素，如道路或一个兴趣点。\n被选中的要素将被高亮显示，同时弹出一个显示其详细信息的面板，\n以及一个列出了可对该特征进行之操作的菜单。\n\n如需同时选中多个要素，您需要先按住 Shift 键。然后请多次点击选择全部的特征，\n或者在地图上画出一个长方形以圈出并选中长方形中所有的点。\n\n### 保存编辑内容\n\n当您做了比如编辑道路、建筑物或地点的更改后，\n这些更改在您将它们保存到服务器之前都只会保存在本地。\n无需担心犯错：您随时可以点击撤销按钮或重做按钮以撤销或重做更改。\n\n请点击“保存”按钮以结束一组编辑内容。例如，如果您刚完成了城镇的一个区域，\n正打算开始下一个区域的工作，这时您有机会重新检查之前完成的工作，\n同时编辑器会自动给出有用的建议。如果您的更改有一些问题，编辑器也会给出警告。\n\n如果一切正常，您可以在保存时写入一小段注释以解释上一阶段的工作内容，\n然后再次点击“保存”按钮以向\n[OpenStreetMap.org](http://www.openstreetmap.org/) 提交更改。\n在此之后，您的更改将对所有其它用户可见，其它用户也将以此为基础继续改进地图。\n\n如果您一时无法完成编辑内容，您可以关闭编辑器窗口。\n待稍后您返回 (至同一台计算机的同一个浏览器) 时，\n重新打开编辑器将会恢复您的工作进度。\n\n## 使用编辑器\n\n编辑器可用的键盘快捷键列表可以 [在此](http://wiki.openstreetmap.org/wiki/ID/Shortcuts) 找到。\n",

         "roads": "# 道路\n\n您可以利用这个编辑器创建，修复，及删除道路。道路可以有很多种：路径，公路，郊游径，单车径，和更多－ 任何经常使用的路段都可制图。\n\n### 选择道路\n\n点击图上的道路以选择该道路。道路的轮廓会以高亮度显示，而同时地图上会出现小工具选单，旁边亦会弹出面板，显示有关该道路的信息。\n\n### 编辑道路\n\n您或会经常注意到，道路并非对齐在背景中显示的卫星图像或GPS轨迹。您可以调整这些道路，让他们位于正确的位置。\n\n首先，点击您想编辑的道路。这会将道路以高亮度显示，并显示沿着这道路的节点，你可以拖曳这些节点到更好的位置。如果您想增加细节，可以为道路添加新的节点，点击两下道路上没有节点的部分，便可在该处増加节点。\n\n如果道路连接到另一条道路，但在地图上并未妥善连接，你可以拖曳道路的其中一个节点到另一条道路上，以连接两条道路。连接好道路，对地图非常重要，特别是对提供驾驶指示的应用程序而言，是必要的。\n\n您也可以点击'移动'工具或按`M`快速键，来移动整条道路，然后点击一下以完成移动的动作。\n\n### 删除道路\n\n如果一条道路完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将道路删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该道路或许只是新建的。\n\n要删除道路，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n\n### 绘制新道路\n\n发现某处应有一条道路，但地图上没有？点击编辑器左上方的'线'图标，或按下`2`快速键，以开始绘制线段。\n\n在地图上点击道路的开端，以开始绘制道路。如果道路从一条现有的道路分支出来，应点击两者连接的地方，以开始绘制。\n\n然后点击沿着道路的点，以根据卫星影像或GPS轨迹，正确地绘制道路。如果您绘制的道路如果与另一条道路交汇，请点击相交点以将它们连接起来。当您完成绘制后，可点击两下或按键盘上的'Return' 或'Enter' 键。\n",
         "roads": "# 道路\n\n您可以利用这个编辑器创建，修复，及删除道路。道路可以有很多种：路径，公路，郊游径，单车径，和更多－ 任何经常使用的路段都可制图。\n\n### 选择道路\n\n点击图上的道路以选择该道路。道路的轮廓会以高亮度显示，而同时地图上会出现小工具选单，旁边亦会弹出面板，显示有关该道路的信息。\n\n### 编辑道路\n\n您或会经常注意到，道路并非对齐在背景中显示的卫星图像或GPS轨迹。您可以调整这些道路，让他们位于正确的位置。\n\n首先，点击您想编辑的道路。这会将道路以高亮度显示，并显示沿着这道路的节点，你可以拖曳这些节点到更好的位置。如果您想增加细节，可以为道路添加新的节点，点击两下道路上没有节点的部分，便可在该处増加节点。\n\n如果道路连接到另一条道路，但在地图上并未妥善连接，你可以拖曳道路的其中一个节点到另一条道路上，以连接两条道路。连接好道路，对地图非常重要，特别是对提供驾驶指示的应用程序而言，是必要的。\n\n您也可以点击'移动'工具或按`M`快速键，来移动整条道路，然后点击一下以完成移动的动作。\n\n### 删除道路\n\n如果一条道路完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将道路删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该道路或许只是新建的。\n\n要删除道路，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n\n### 绘制新道路\n\n发现某处应有一条道路，但地图上没有？点击编辑器左上方的'线'图标，或按下`2`快速键，以开始绘制线段。\n\n在地图上点击道路的开端，以开始绘制道路。如果道路从一条现有的道路分支出来，应点击两者连接的地方，以开始绘制。\n\n然后点击沿着道路的点，以根据卫星影像或GPS轨迹，正确地绘制道路。如果您绘制的道路如果与另一条道路交汇，请点击相交点以将它们连接起来。当您完成绘制后，可点击两下或按键盘上的'Return' 或'Enter' 键。\n",

-        "gps": "# GPS\n\nGPS 数据是 OpenStreetMap 中最可信的信息。本编辑器\n支持你电脑中的本地路线数据 - `.gpx`。你可以通过某些\n智能手机中的应用程序或个人 GPS 设备收集此类型的 GPS \n路线数据。\n\n关于如何进行 GPS 测量的信息请参阅[使用 GPS 测量信息]\n(http://learnosm.org/en/beginner/using-gps/)。\n\n要使用 GPX 路线绘制地图，拖动 GPX 文件至地图编辑器中。\n如果被识别到了，会变成亮绿色的线。点击右侧的“背景设置”\n菜单来开启、关闭、或者缩放这个新的GPX图层。\n\nGPX 路线数据不会被直接上传到 OpenStreetMap 中。使用\n它的最好的方式是以它为参照绘制出你需要添加的要素。你可\n以可以[上传到 OpenStreetMap ](http://www.openstreetmap.org/trace/create)\n以便其他用处。\n",
-        "addresses": "＃地址\n\n地址是地图上的最有用的一些信息。\n\nOpenStreetMap通过沿街位置记录建筑和场所的地址，地址通常表示为街道的一部分。\n\n您可以添加地址信息映射为建筑轮廓的地方以及那些映射为单个点。地址的最佳来源数据是来自于实地调查或个人的知识与任何其他功能，从谷歌地图商业来源的复制是严格禁止的。\n",
-        "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界，以选择该建筑物。该建筑物将以高亮度显示，并会开启小工具选单，和在右边显示有关建筑物更多资料的面板。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后点击'移动'工具。移动您的滑鼠以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n为地图添加建筑物的主要问题之一，是OpenStreetMap 可以用轮廓或点的形式，记录建筑物。一般来说，应_尽可能以区域记录建筑物的轮廓_，并以置于建筑轮廓内的点，记录建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后则按键盘上的'Return'键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一项建筑物完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将建筑物删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该建筑物或许只是新建的。\n\n要删除建筑物，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n"
+        "gps": "# GPS\n\n户外采集的GPS轨迹是OpenStreetMap的重要数据源之一。本编辑器\n支持本地轨迹——即你的电脑上的.gpx文件。你可以用众多智能手机\n应用或者个人GPS硬件采集这种GPS轨迹。\n\n有关如何使用GPS测量的信息，请参见\n[用智能手机、GPS或纸质图测图](http://learnosm.org/en/mobile-mapping/)。\n\n要使用GPX轨迹制图，将GPX文件拖曳到编辑器上即可。\n如果可以识别，将以亮紫色线条在地图上显示。\n点击右侧“地图数据”菜单可以打开、关闭或者\n缩放到新添加的GPX图层。\n\nGPX轨迹不会被直接上传到OpenStreetMap——最佳的使用方法是\n将其展绘到地图上作为辅助来绘制新增的地图要素，\n或者将其[上传到OpenStreetMap](http://www.openstreetmap.org/trace/create)\n供他人使用。\n",
+        "imagery": "# 影像\n\n航拍影像是绘制地图的一个重要资源。编辑器右侧「背景设置」菜单里提供了一组飞机航拍、卫星影像及自由编译的来源。\n\n默认情况下编辑器显示的是[必应地图](http://www.bing.com/maps/)的卫星图层，但当您移动或缩放地图到一个新的地理区域会得到新的来源。一些国家，比如美国、法国和丹麦，会在一些区域提供非常高质量的影像。\n\n影像有时会因为影像提供商的错误和地图数据存在偏移。如果您看到许多道路偏离背景，请不要立刻移动它们来匹配背景，您可以点击背景设置界面底部的「修复对齐」来调整影像以使它和已有数据吻合。\n",
+        "addresses": "# 地址\n\n地址是地图上的最有用的一些信息。\n\nOpenStreetMap通过沿街位置记录建筑和场所的地址，地址通常表示为街道的一部分。\n\n您可以添加地址信息映射为建筑轮廓的地方以及那些映射为单个点。地址的最佳来源数据是来自于实地调查或个人的知识与任何其他功能，从谷歌地图商业来源的复制是严格禁止的。\n",
+        "inspector": "# 使用查看器\n\n查看器是页面左侧窗格中供你\n查看所选要素详细信息栏目。\n\n### 选择要素类型\n\n你添加完一个点、线或面之后，要选择它是什么类型，\n比如高速公路还是居民区街道、超市还是咖啡厅。\n查看器会显示一些常见要素类型的按钮，你也可以通过\n搜索框查找其他标签。\n\n点击要素类型按钮右下角的“i”可以深入了解该类型。\n点击类型按钮即可选择该类型。\n\n### 使用表格编辑标签\n\n选择要素类型后，或者某要素本来已有类型时，\n查看器会显示要素的字段详情，比如名称和地\n址。\n\n在已有的字段下方，你可以点击“添加字段”下拉菜单\n来添加其他详情，比如维基百科链接、轮椅通行情况\n等。\n\n在查看器底部，可以点击“附加标签”按钮来给要素添加\n任意其他标签。[Taginfo](http://taginfo.openstreetmap.org/)\n是了解更多常见标签组合的好资源。\n\n你在查看器里所做的变更会自动应用到地图。\n你可以随时点击“撤销”按钮撤销这些变更。\n",
+        "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界，以选择该建筑物。该建筑物将以高亮度显示，并会开启小工具选单，和在右边显示有关建筑物更多资料的面板。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后点击'移动'工具。移动您的鼠标以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n为地图添加建筑物的主要问题之一，是OpenStreetMap 可以用轮廓或点的形式，记录建筑物。一般来说，应_尽可能以区域记录建筑物的轮廓_，并以置于建筑轮廓内的点，记录建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后则按键盘上的回车键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一个建筑物完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将建筑物删除，这会从地图中将之移除。删除要素时务必要小心－ 像任何其他的编辑一样，结果会公之于众，而卫星图像往往会过时，因此该建筑物或许只是新建的。\n\n要删除建筑物，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n",
+        "relations": "# 关系\n\n关系是 OpenStreetMap 中用于组合其它特征的特殊要素类型。比如，两个基本关系类型*路径关系*和*复合多边形*，它们分别用于组合同一条公路或高速公路的不同部分和一个复杂区域(分成多块或像油炸圈饼一样中间有个洞)的多条线条。\n\n关系中包含的要素称为*成员*。在侧边栏中，您可以看到成员所属的关系，并点击选中它。选中某个关系后，您就能看到它的所有成员在侧边栏被全部列出并在地图上被高亮显示。\n\n在大多数时候，iD 会在您编辑的时候自动处理关系。您主要注意的是当您删除道路的某个部分并重绘它时，请确保新的部分还是原来的关系中的一员。\n\n## 编辑关系\n\n如果您想要编辑关系，这里是一些基本技巧。\n\n要向关系中添加要素，选择该要素，点击侧边栏「所有关系」中的「+」按钮，并选择或输入关系的名称。\n\n要创建一个新的关系，选中要作为成员的第一个特征，点击「所有关系」中的「+」按钮，并选择「新建关系...」。\n\n要从一个关系中移除要素，选择要素并点击您要从中移除的关系旁边的垃圾箱按钮。\n\n您可以使用「合并」工具创建有洞的复合多边形。绘制两个区域(内部和外部)，按住 Shift 键并点击各个多边形来选中它们，然后点击「合并」(+)按钮。\n"

     },
     "intro": {
         "navigation": {
             "title": "导航",
             "drag": "主地图区域在背景上展示了 OpenStreetMap 数据。您可以像在其它网络地图一样通过拖动和滚动来移动。**拖动地图！**",
     },
     "intro": {
         "navigation": {
             "title": "导航",
             "drag": "主地图区域在背景上展示了 OpenStreetMap 数据。您可以像在其它网络地图一样通过拖动和滚动来移动。**拖动地图！**",

-            "select": "地图物件有三种表示方式：点、线以及区域，所有要素都可以通过点击选择。 **点击该点来选择它**",
+            "select": "地图要素有三种表示方法：点、线、面。所有要素都可以通过点击选择。**单击该点来选定它。**",

             "header": "上方显示特征类型",
             "header": "上方显示特征类型",

-            "pane": "选择一个要素后，会显示要素编辑器。上方显示物件类型，主面板则显示物件的属性，如物件的名称与地址等。 **点击物件编辑器右上角的关闭按钮，关闭要素编辑器**"
+            "pane": "当选定一个特征时，会出现特征编辑器。抬头展示特征类型，主窗格展示特征的属性，如名称和地址。**单击特征编辑器右上角的关闭按钮，关闭特征编辑器。**"

         },
         "points": {
             "title": "点",
         },
         "points": {
             "title": "点",

-            "add": "点可以用来表示像是商店、餐厅与古迹之类的要素，它们标示一个特定位置，并且描述那里有什么。 **点击「点」按钮以新增一点**",
+            "add": "点可以用于代表诸如商店、餐馆和历史遗迹的特征。它们标记一个特定的地点，并说明该地点是什么。**单击“点”按钮添加新点。**",

             "place": "在地图上点击，可以地图上新增的一点。 **将该点放到建筑物上方**",
             "search": "很多不同的物体可以用点来代表。您刚刚新增加的点是一间咖啡厅。**搜索'{name}'**",
             "choose": "**在列表中选择咖啡馆。**",
             "place": "在地图上点击，可以地图上新增的一点。 **将该点放到建筑物上方**",
             "search": "很多不同的物体可以用点来代表。您刚刚新增加的点是一间咖啡厅。**搜索'{name}'**",
             "choose": "**在列表中选择咖啡馆。**",

-            "describe": "这个点现在标示为咖啡厅，通过要素编辑器，我们可以加入更多相关信息。 **新增一个名称**",
-            "close": "ç\82¹é\80\89å\85³é\97­æ\8c\89é\92®å°±å\8f¯ä»¥å\85³é\97­ç\89©ä»¶ç¼\96è¾\91å\99¨ã\80\82 **å\85³é\97­è¦\81ç´ 编辑器**",
+            "describe": "这个点已经标记为咖啡馆了。使用特征编辑器，我们可以添加更多关于特征的信息。**添加名称**",
+            "close": "ç\89¹å¾\81ç¼\96è¾\91å\99¨å\8f¯ä»¥é\80\9aè¿\87å\8d\95å\87»å\85³é\97­æ\8c\89é\92®æ\9d¥å\85³é\97­ã\80\82**å\85³é\97­ç\89¹å¾\81编辑器**",

             "reselect": "很多时候，所需的点已经存在，但有错误或不完整。我们可以编辑现有的点。 **选择您刚创建的点**",
             "reselect": "很多时候，所需的点已经存在，但有错误或不完整。我们可以编辑现有的点。 **选择您刚创建的点**",

-            "fixname": "**æ\9b´æ\94¹å\90\8d称ï¼\8c并å\85³é\97­è¯¥è¦\81ç´ ç\9a\84编辑器。**",
-            "reselect_delete": "地图上的所有要素都可以删除。**点击你创建的那个点。**",
+            "fixname": "**æ\9b´æ\94¹å\90\8d称ï¼\8cå\85³é\97­ç\89¹å¾\81编辑器。**",
+            "reselect_delete": "地图上的所有特征都可以删除。**单击你创建的点。**",

             "delete": "在点周围的菜单包含在该点可执行的操作，包括删除。**删除点。**"
         },
         "areas": {
             "delete": "在点周围的菜单包含在该点可执行的操作，包括删除。**删除点。**"
         },
         "areas": {

-            "title": "区域",
-            "add": "区域能较详细地代表物件，提供该物件的边界资料。大部份以点可以代表的物件类别，都可以用区域代表，而后者往往更为适合。 **点击「区域」按钮，以新增一个区域**",
+            "title": "面状要素",
+            "add": "面用来表示要素的界限，像是湖、建筑物或住宅区。也就是说可以让原本只是个兴趣点的要素呈现更多细节。 **按下面的按钮新建面要素**",

             "corner": "通过将节点放到面的边界上，可绘制面。 **将起始节点置于游乐场的其中一角**",
             "corner": "通过将节点放到面的边界上，可绘制面。 **将起始节点置于游乐场的其中一角**",

-            "place": "放置更多节点可绘制区域。点击开始节点即可完成绘制。**在沙盒绘制一个区域。**",
+            "place": "放置更多节点可绘制面要素。点击开始节点即可完成绘制。**在沙盒绘制一个面。**",

             "search": "**搜索'{name}'。**",
             "choose": "**在列表中选择儿童游乐场。**",
             "search": "**搜索'{name}'。**",
             "choose": "**在列表中选择儿童游乐场。**",

-            "describe": "**添加一个名字，并关闭该要素编辑器**"
+            "describe": "**添加名称，关闭特征编辑器**"

         },
         "lines": {
             "title": "线",
         },
         "lines": {
             "title": "线",

-            "add": "线条用来表示例如道路、铁道与河流之类的要素。**点击线条按钮来添加新的线条。**",
+            "add": "线用于代表诸如道路、铁路和河流的特征。**单击“线”按钮添加新线。**",

             "start": "**点击道路末端，以开始绘制线段。 **",
             "intersect": "点击向线添加更多节点。必要时您可以在绘制时拖动地图。道路和许多其它类型的线都是一个更大的网络的组成部分，因此正确连接这些线以便导航应用使用是十分重要的。**点击 Flower Street 创建连接两条线的交叉点。**",
             "finish": "再次点击最后一个节点可结束绘制线。**完成道路的绘制。**",
             "road": "**在列表中选择道路**",
             "residential": "道路有不同种类，最常见的为住宅区道路。 **选择住宅区道路**",
             "start": "**点击道路末端，以开始绘制线段。 **",
             "intersect": "点击向线添加更多节点。必要时您可以在绘制时拖动地图。道路和许多其它类型的线都是一个更大的网络的组成部分，因此正确连接这些线以便导航应用使用是十分重要的。**点击 Flower Street 创建连接两条线的交叉点。**",
             "finish": "再次点击最后一个节点可结束绘制线。**完成道路的绘制。**",
             "road": "**在列表中选择道路**",
             "residential": "道路有不同种类，最常见的为住宅区道路。 **选择住宅区道路**",

-            "describe": "**ç»\99é\81\93è·¯å\91½å\90\8dï¼\8c并å\85³é\97­è¯¥è¦\81ç´ 编辑器。**",
+            "describe": "**ç»\99é\81\93è·¯å\91½å\90\8dï¼\8cå\85³é\97­ç\89¹å¾\81编辑器。**",

             "restart": "道路需要花街相交。",
             "wrong_preset": "你没有选择住宅道路类型。 **点击这里重新选择**"
         },
             "restart": "道路需要花街相交。",
             "wrong_preset": "你没有选择住宅道路类型。 **点击这里重新选择**"
         },


@@ -403,6 +568,9 @@
             "category-rail": {
                 "name": "铁轨"
             },
             "category-rail": {
                 "name": "铁轨"
             },

+            "category-restriction": {
+                "name": "限制"
+            },

             "category-road": {
                 "name": "道路"
             },
             "category-road": {
                 "name": "道路"
             },


@@ -418,53 +586,69 @@
         },
         "fields": {
             "access": {
         },
         "fields": {
             "access": {

-                "label": "通行限制",
-                "placeholder": "未知",
-                "types": {
-                    "access": "普通",
-                    "foot": "步行",
-                    "motor_vehicle": "汽车",
-                    "bicycle": "自行车",
-                    "horse": "马匹"
-                },
+                "label": "通行规则",

                 "options": {
                 "options": {

-                    "yes": {
-                        "title": "允许的",
-                        "description": "按法律及路权，有权使用"
+                    "designated": {
+                        "description": "只限标志指定或特定本地法律容许人士进入",
+                        "title": "特定的"
+                    },
+                    "destination": {
+                        "description": "只限前往目的地人士进入",
+                        "title": "目的地"
+                    },
+                    "dismount": {
+                        "description": "允许通行但必须下车",
+                        "title": "下车"

                     },
                     "no": {
                     },
                     "no": {

-                        "title": "禁止的",
-                        "description": "禁止一般公众进入"
+                        "description": "禁止一般公众进入",
+                        "title": "禁止的"

                     },
                     "permissive": {
                     },
                     "permissive": {

-                        "title": "获许可进入",
-                        "description": "容许进入，直至拥有者撇回许可"
+                        "description": "容许进入，直至拥有者撇回许可",
+                        "title": "获许可进入"

                     },
                     "private": {
                     },
                     "private": {

-                        "title": "私人",
-                        "description": "须拥有者个别批准，方可进入"
-                    },
-                    "designated": {
-                        "title": "特定的",
-                        "description": "只限标志指定或特定本地法律容许人士进入"
+                        "description": "须拥有者个别批准，方可进入",
+                        "title": "私人"

                     },
                     },

-                    "destination": {
-                        "title": "目的地",
-                        "description": "只限前往目的地人士进入"
+                    "yes": {
+                        "description": "按法律及路权，有权使用",
+                        "title": "允许的"

                     }
                     }

+                },
+                "placeholder": "未指定",
+                "types": {
+                    "access": "全部",
+                    "bicycle": "自行车",
+                    "foot": "步行",
+                    "horse": "马匹",
+                    "motor_vehicle": "汽车"

                 }
             },
             "access_simple": {
                 }
             },
             "access_simple": {

-                "label": "通行限制"
+                "placeholder": "是"
+            },
+            "access_toilets": {
+                "label": "连接"

             },
             "address": {
                 "label": "地址",
                 "placeholders": {
             },
             "address": {
                 "label": "地址",
                 "placeholders": {

+                    "city": "城市",
+                    "conscriptionnumber": "123",
+                    "country": "国家",
+                    "district": "行政区",
+                    "hamlet": "村庄",

                     "housename": "房屋名称",
                     "housename": "房屋名称",

-                    "number": "123号",
+                    "housenumber": "123号",
+                    "place": "地方",
+                    "postcode": "邮政编码",
+                    "province": "行政省",
+                    "state": "行政州",

                     "street": "街道",
                     "street": "街道",

-                    "city": "城市",
-                    "postcode": "邮政编码"
+                    "subdistrict": "街道",
+                    "suburb": "地区"

                 }
             },
             "admin_level": {
                 }
             },
             "admin_level": {


@@ -473,6 +657,17 @@
             "aerialway": {
                 "label": "类型"
             },
             "aerialway": {
                 "label": "类型"
             },

+            "aerialway/access": {
+                "label": "通行限制",
+                "options": {
+                    "both": "双向",
+                    "entry": "入口",
+                    "exit": "出口"
+                }
+            },
+            "aerialway/bubble": {
+                "label": "圆形顶"
+            },

             "aerialway/capacity": {
                 "label": "容量(每小时)",
                 "placeholder": "500, 2500, 5000..."
             "aerialway/capacity": {
                 "label": "容量(每小时)",
                 "placeholder": "500, 2500, 5000..."


@@ -481,15 +676,30 @@
                 "label": "持续时间(分钟)",
                 "placeholder": "1, 2, 3..."
             },
                 "label": "持续时间(分钟)",
                 "placeholder": "1, 2, 3..."
             },

+            "aerialway/heating": {
+                "label": "暖气"
+            },

             "aerialway/occupancy": {
             "aerialway/occupancy": {

+                "label": "载客数",

                 "placeholder": "2, 4, 8..."
             },
                 "placeholder": "2, 4, 8..."
             },

+            "aerialway/summer/access": {
+                "label": "通行方向（夏季）",
+                "options": {
+                    "both": "双方",
+                    "entry": "入口",
+                    "exit": "出口"
+                }
+            },

             "aeroway": {
                 "label": "类型"
             },
             "amenity": {
                 "label": "类型"
             },
             "aeroway": {
                 "label": "类型"
             },
             "amenity": {
                 "label": "类型"
             },

+            "area/highway": {
+                "label": "类型"
+            },

             "artist": {
                 "label": "艺人"
             },
             "artist": {
                 "label": "艺人"
             },


@@ -505,12 +715,18 @@
             "barrier": {
                 "label": "类型"
             },
             "barrier": {
                 "label": "类型"
             },

+            "bench": {
+                "label": "长凳"
+            },

             "bicycle_parking": {
                 "label": "类型"
             },
             "boundary": {
                 "label": "类型"
             },
             "bicycle_parking": {
                 "label": "类型"
             },
             "boundary": {
                 "label": "类型"
             },

+            "brand": {
+                "label": "品牌"
+            },

             "building": {
                 "label": "建筑物"
             },
             "building": {
                 "label": "建筑物"
             },


@@ -522,13 +738,31 @@
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {

-                "label": "方向"
+                "label": "方向",
+                "options": {
+                    "E": "东",
+                    "ENE": "东北偏东",
+                    "ESE": "东南偏东",
+                    "N": "北",
+                    "NE": "东北",
+                    "NNE": "东北偏北",
+                    "NNW": "西北偏北",
+                    "NW": "西北",
+                    "S": "南",
+                    "SE": "东南",
+                    "SSE": "东南偏南",
+                    "SSW": "西南偏南",
+                    "SW": "西南",
+                    "W": "西",
+                    "WNW": "西北偏西",
+                    "WSW": "西南偏西"
+                }

             },
             "clock_direction": {
                 "label": "方向",
                 "options": {
             },
             "clock_direction": {
                 "label": "方向",
                 "options": {

-                    "clockwise": "顺时针",
-                    "anticlockwise": "逆时针"
+                    "anticlockwise": "逆时针",
+                    "clockwise": "顺时针"

                 }
             },
             "collection_times": {
                 }
             },
             "collection_times": {


@@ -543,12 +777,59 @@
             "covered": {
                 "label": "覆盖"
             },
             "covered": {
                 "label": "覆盖"
             },

+            "craft": {
+                "label": "种类"
+            },
+            "crop": {
+                "label": "庄稼"
+            },

             "crossing": {
                 "label": "类型"
             },
             "cuisine": {
                 "label": "菜肴"
             },
             "crossing": {
                 "label": "类型"
             },
             "cuisine": {
                 "label": "菜肴"
             },

+            "cycleway": {
+                "label": "自行车道",
+                "options": {
+                    "lane": {
+                        "description": "交通标线与机动车隔开的自行车道",
+                        "title": "标准自行车道"
+                    },
+                    "none": {
+                        "description": "无自行车道",
+                        "title": "无"
+                    },
+                    "opposite": {
+                        "description": "单行街道上双向行驶的自行车道",
+                        "title": "逆向自行车道"
+                    },
+                    "opposite_lane": {
+                        "description": "和其他车辆反向行驶的自行车道",
+                        "title": "对向自行车道"
+                    },
+                    "share_busway": {
+                        "description": "与公交车道共用的自行车道",
+                        "title": "与公交车共用的自行车道"
+                    },
+                    "shared_lane": {
+                        "description": "与机动车无隔离的自行车道",
+                        "title": "共用自行车道"
+                    },
+                    "track": {
+                        "description": "有物理隔离的自行车道",
+                        "title": "专用自行车道"
+                    }
+                },
+                "placeholder": "无",
+                "types": {
+                    "cycleway:left": "左侧",
+                    "cycleway:right": "右侧"
+                }
+            },
+            "delivery": {
+                "label": "邮寄"
+            },

             "denomination": {
                 "label": "教派"
             },
             "denomination": {
                 "label": "教派"
             },


@@ -558,8 +839,18 @@
             "description": {
                 "label": "说明"
             },
             "description": {
                 "label": "说明"
             },

+            "drive_through": {
+                "label": "免下车"
+            },

             "electrified": {
             "electrified": {

-                "label": "电气化"
+                "label": "电气化",
+                "options": {
+                    "contact_line": "接触线",
+                    "no": "否",
+                    "rail": "电气化铁路",
+                    "yes": "是(未指明)"
+                },
+                "placeholder": "接触线、电气化铁路…"

             },
             "elevation": {
                 "label": "海拔"
             },
             "elevation": {
                 "label": "海拔"


@@ -570,6 +861,9 @@
             "entrance": {
                 "label": "类型"
             },
             "entrance": {
                 "label": "类型"
             },

+            "except": {
+                "label": "异常"
+            },

             "fax": {
                 "label": "传真",
                 "placeholder": "+31 42 123 4567"
             "fax": {
                 "label": "传真",
                 "placeholder": "+31 42 123 4567"


@@ -578,14 +872,59 @@
                 "label": "费用"
             },
             "fire_hydrant/type": {
                 "label": "费用"
             },
             "fire_hydrant/type": {

-                "label": "类型"
+                "label": "类型",
+                "options": {
+                    "pillar": "支柱/地上",
+                    "pond": "池塘",
+                    "underground": "地铁",
+                    "wall": "墙"
+                }

             },
             "fixme": {
                 "label": "修复我"
             },
             },
             "fixme": {
                 "label": "修复我"
             },

+            "fuel": {
+                "label": "油站"
+            },
+            "fuel/biodiesel": {
+                "label": "销售生物柴油"
+            },
+            "fuel/diesel": {
+                "label": "销售柴油"
+            },
+            "fuel/e10": {
+                "label": "销售E10"
+            },
+            "fuel/e85": {
+                "label": "销售E85"
+            },
+            "fuel/lpg": {
+                "label": "销售丙烷"
+            },
+            "fuel/octane_100": {
+                "label": "销售赛车汽油"
+            },
+            "fuel/octane_91": {
+                "label": "销售普通汽油"
+            },
+            "fuel/octane_95": {
+                "label": "销售中等汽油"
+            },
+            "fuel/octane_98": {
+                "label": "销售高级汽油"
+            },

             "gauge": {
                 "label": "轨距"
             },
             "gauge": {
                 "label": "轨距"
             },

+            "gender": {
+                "label": "性别",
+                "options": {
+                    "female": "女",
+                    "male": "男",
+                    "unisex": "中性"
+                },
+                "placeholder": "未知"
+            },

             "generator/method": {
                 "label": "模式"
             },
             "generator/method": {
                 "label": "模式"
             },


@@ -596,9 +935,11 @@
                 "label": "类型"
             },
             "golf_hole": {
                 "label": "类型"
             },
             "golf_hole": {

-                "label": "参考"
+                "label": "参考",
+                "placeholder": "球洞编号（1-18）"

             },
             "handicap": {
             },
             "handicap": {

+                "label": "手工店",

                 "placeholder": "1-18"
             },
             "highway": {
                 "placeholder": "1-18"
             },
             "highway": {


@@ -607,6 +948,10 @@
             "historic": {
                 "label": "类型"
             },
             "historic": {
                 "label": "类型"
             },

+            "hoops": {
+                "label": "篮球",
+                "placeholder": "1, 2, 4..."
+            },

             "iata": {
                 "label": "国际航空运输协会IATA"
             },
             "iata": {
                 "label": "国际航空运输协会IATA"
             },


@@ -616,17 +961,29 @@
             "incline": {
                 "label": "斜度"
             },
             "incline": {
                 "label": "斜度"
             },

+            "incline_steps": {
+                "label": "坡度",
+                "options": {
+                    "down": "下",
+                    "up": "上"
+                }
+            },

             "information": {
                 "label": "类型"
             },
             "internet_access": {
                 "label": "互联网接入",
                 "options": {
             "information": {
                 "label": "类型"
             },
             "internet_access": {
                 "label": "互联网接入",
                 "options": {

-                    "wlan": "Wi-Fi",
+                    "no": "否",
+                    "terminal": "终端",

                     "wired": "有线网络",
                     "wired": "有线网络",

-                    "terminal": "终端"
+                    "wlan": "Wi-Fi",
+                    "yes": "是"

                 }
             },
                 }
             },

+            "lamp_type": {
+                "label": "类型"
+            },

             "landuse": {
                 "label": "类型"
             },
             "landuse": {
                 "label": "类型"
             },


@@ -637,9 +994,51 @@
             "layer": {
                 "label": "图层"
             },
             "layer": {
                 "label": "图层"
             },

+            "leaf_cycle": {
+                "label": "叶寿命",
+                "options": {
+                    "deciduous": "落叶",
+                    "evergreen": "常绿",
+                    "mixed": "混交林",
+                    "semi_deciduous": "半落叶",
+                    "semi_evergreen": "半常绿"
+                }
+            },
+            "leaf_cycle_singular": {
+                "label": "叶寿命",
+                "options": {
+                    "deciduous": "落叶树",
+                    "evergreen": "常绿树",
+                    "semi_deciduous": "半落叶树",
+                    "semi_evergreen": "半常绿树"
+                }
+            },
+            "leaf_type": {
+                "label": "叶型",
+                "options": {
+                    "broadleaved": "阔叶",
+                    "leafless": "无叶",
+                    "mixed": "混交林",
+                    "needleleaved": "针叶"
+                }
+            },
+            "leaf_type_singular": {
+                "label": "叶型",
+                "options": {
+                    "broadleaved": "阔叶",
+                    "leafless": "无叶",
+                    "needleleaved": "针叶"
+                }
+            },

             "leisure": {
                 "label": "类型"
             },
             "leisure": {
                 "label": "类型"
             },

+            "length": {
+                "label": "高度(米)"
+            },
+            "level": {
+                "label": "楼层"
+            },

             "levels": {
                 "label": "层次",
                 "placeholder": "2, 4, 6..."
             "levels": {
                 "label": "层次",
                 "placeholder": "2, 4, 6..."


@@ -657,6 +1056,42 @@
                 "label": "速度限制",
                 "placeholder": "40, 50, 60..."
             },
                 "label": "速度限制",
                 "placeholder": "40, 50, 60..."
             },

+            "mtb/scale": {
+                "label": "登山車难度",
+                "options": {
+                    "0": "0：坚实的硕石土路，没有障碍物，大湾曲",
+                    "1": "1：铺面部分松散，有小的障碍物，大弯曲",
+                    "2": "2：大都是松散的铺面，有的障碍物，容易通过的发夹弯",
+                    "3": "3：铺面光滑，有大的障碍物",
+                    "4": "4：路面松散或是充满石头，有危险的发夹弯",
+                    "5": "5：骑乘等级最困难，路面充满石头，或者是路面坍方",
+                    "6": "6：除非是技巧极好的越野车手，否则并不适合骑乘"
+                },
+                "placeholder": "0, 1, 2, 3..."
+            },
+            "mtb/scale/imba": {
+                "label": "国际登山车协会路径难度",
+                "options": {
+                    "0": "最简单(白圈)",
+                    "1": "容易(绿圈)",
+                    "2": "中等(蓝方块)",
+                    "3": "困难(黑色钻石型)",
+                    "4": "极端困难(双重黑色钻石型)"
+                },
+                "placeholder": "简单,中等,困难..."
+            },
+            "mtb/scale/uphill": {
+                "label": "山地自行车上坡难度",
+                "options": {
+                    "0": "0：平均坡度小于10％时，有碎石/夯实的地面，没有障碍物",
+                    "1": "1：平均坡度小于15％，有碎石/夯实的地面，有些许障碍物",
+                    "2": "2：平均坡度小于20，坚实的地面，拳头大的石头/树根",
+                    "3": "3：平均坡度25％，多变的平面，拳头大的石头/树墙",
+                    "4": "4：平均坡度小于30％时，很糟的路面状况，大石头/树墙",
+                    "5": "5：很陡，单车得牵行或扛车"
+                },
+                "placeholder": "0, 1, 2, 3..."
+            },

             "name": {
                 "label": "名称",
                 "placeholder": "常用名称（如果有）"
             "name": {
                 "label": "名称",
                 "placeholder": "常用名称（如果有）"


@@ -674,10 +1109,20 @@
                 "label": "类型"
             },
             "oneway": {
                 "label": "类型"
             },
             "oneway": {

-                "label": "单行线"
+                "label": "单行线",
+                "options": {
+                    "no": "否",
+                    "undefined": "假定为否",
+                    "yes": "是"
+                }

             },
             "oneway_yes": {
             },
             "oneway_yes": {

-                "label": "单行线"
+                "label": "单行线",
+                "options": {
+                    "no": "否",
+                    "undefined": "假定为是",
+                    "yes": "是"
+                }

             },
             "opening_hours": {
                 "label": "开放时间"
             },
             "opening_hours": {
                 "label": "开放时间"


@@ -686,33 +1131,106 @@
                 "label": "经营者"
             },
             "par": {
                 "label": "经营者"
             },
             "par": {

+                "label": "标准杆",

                 "placeholder": "3, 4, 5..."
             },
             "park_ride": {
                 "label": "停车换乘"
             },
             "parking": {
                 "placeholder": "3, 4, 5..."
             },
             "park_ride": {
                 "label": "停车换乘"
             },
             "parking": {

-                "label": "类型"
+                "label": "类型",
+                "options": {
+                    "carports": "车棚",
+                    "garage_boxes": "车库盒",
+                    "lane": "路边",
+                    "multi-storey": "多晨",
+                    "sheds": "单独车库",
+                    "surface": "地面",
+                    "underground": "地下"
+                }

             },
             "phone": {
                 "label": "电话",
                 "placeholder": "+31 42 123 4567"
             },
             "piste/difficulty": {
             },
             "phone": {
                 "label": "电话",
                 "placeholder": "+31 42 123 4567"
             },
             "piste/difficulty": {

-                "label": "困难"
+                "label": "困难",
+                "options": {
+                    "advanced": "进阶(黑色钻石型)",
+                    "easy": "容易(绿圈)",
+                    "expert": "专家(双重黑色钻石型)",
+                    "extreme": "极端困难(需要攀登工具)",
+                    "freeride": "自由滑行(场地外)",
+                    "intermediate": "中阶(蓝方块)",
+                    "novice": "新手(教学)"
+                },
+                "placeholder": "容易，中阶，进阶"
+            },
+            "piste/grooming": {
+                "label": "雪道类型",
+                "options": {
+                    "backcountry": "偏远地区",
+                    "classic": "经典",
+                    "classic+skating": "经典和滑行",
+                    "mogul": "蒙古人",
+                    "scooter": "滑行艇/雪车",
+                    "skating": "滑冰"
+                }

             },
             "piste/type": {
             },
             "piste/type": {

-                "label": "类型"
+                "label": "类型",
+                "options": {
+                    "downhill": "下坡",
+                    "hike": "徒步旅行",
+                    "ice_skate": "冰刀",
+                    "nordic": "北欧人",
+                    "playground": "练习场",
+                    "skitour": "滑雪旅行",
+                    "sled": "雪橇",
+                    "sleigh": "简易雪橇",
+                    "snow_park": "滑雪场"
+                }

             },
             "place": {
                 "label": "类型"
             },
             },
             "place": {
                 "label": "类型"
             },

+            "population": {
+                "label": "人口"
+            },

             "power": {
                 "label": "类型"
             },
             "power": {
                 "label": "类型"
             },

+            "power_supply": {
+                "label": "供电"
+            },

             "railway": {
                 "label": "类型"
             },
             "railway": {
                 "label": "类型"
             },

+            "recycling/cans": {
+                "label": "接受铝管回收"
+            },
+            "recycling/clothes": {
+                "label": "接受衣物回收"
+            },
+            "recycling/glass": {
+                "label": "接受玻璃回收"
+            },
+            "recycling/glass_bottles": {
+                "label": "接受玻璃瓶回收"
+            },
+            "recycling/paper": {
+                "label": "接受纸张回收"
+            },
+            "recycling/plastic": {
+                "label": "接受塑料回收"
+            },
+            "recycling/type": {
+                "label": "回收类型",
+                "options": {
+                    "centre": "回收中心",
+                    "container": "回收容器"
+                }
+            },

             "ref": {
                 "label": "参考"
             },
             "ref": {
                 "label": "参考"
             },


@@ -720,20 +1238,14 @@
                 "label": "类型"
             },
             "religion": {
                 "label": "类型"
             },
             "religion": {

-                "label": "宗教",
-                "options": {
-                    "christian": "基督教",
-                    "muslim": "穆斯林",
-                    "buddhist": "佛教",
-                    "jewish": "犹太教",
-                    "hindu": "印度教",
-                    "shinto": "神道教",
-                    "taoist": "道教"
-                }
+                "label": "宗教"

             },
             "restriction": {
                 "label": "类型"
             },
             },
             "restriction": {
                 "label": "类型"
             },

+            "restrictions": {
+                "label": "转向限制"
+            },

             "route": {
                 "label": "类型"
             },
             "route": {
                 "label": "类型"
             },


@@ -741,11 +1253,51 @@
                 "label": "类型"
             },
             "sac_scale": {
                 "label": "类型"
             },
             "sac_scale": {

-                "label": "行径难度"
+                "label": "远足难度",
+                "options": {
+                    "alpine_hiking": "T4：高山旅行",
+                    "demanding_alpine_hiking": "T5：进阶高山旅行",
+                    "demanding_mountain_hiking": "T3：进阶登山旅行",
+                    "difficult_alpine_hiking": "T6：艰困高山旅行",
+                    "hiking": "T1：徒步旅行",
+                    "mountain_hiking": "T2：登山旅行"
+                },
+                "placeholder": "登山旅行，越岭行走..."
+            },
+            "sanitary_dump_station": {
+                "label": "厕所废物"
+            },
+            "seasonal": {
+                "label": "具备季节性"

             },
             "service": {
                 "label": "类型"
             },
             },
             "service": {
                 "label": "类型"
             },

+            "service/bicycle/chain_tool": {
+                "label": "链条维修工具",
+                "options": {
+                    "no": "否",
+                    "undefined": "假定为否",
+                    "yes": "是"
+                }
+            },
+            "service/bicycle/pump": {
+                "label": "气泵",
+                "options": {
+                    "no": "否",
+                    "undefined": "假定为否",
+                    "yes": " 是"
+                }
+            },
+            "service_rail": {
+                "label": "服务类型",
+                "options": {
+                    "crossover": "渡线",
+                    "siding": "侧线",
+                    "spur": "短途支线",
+                    "yard": "站场线路"
+                }
+            },

             "shelter": {
                 "label": "避难所"
             },
             "shelter": {
                 "label": "避难所"
             },


@@ -755,33 +1307,94 @@
             "shop": {
                 "label": "类型"
             },
             "shop": {
                 "label": "类型"
             },

+            "sloped_curb": {
+                "label": "斜路缘"
+            },
+            "smoking": {
+                "label": "吸烟",
+                "options": {
+                    "dedicated": "吸烟专用",
+                    "isolated": "指定区域可使用（隔开）",
+                    "no": "禁止吸烟",
+                    "outside": "外面可使用",
+                    "separated": "指定区域可使用（布隔开）",
+                    "yes": "随处可使用"
+                },
+                "placeholder": "禁止、隔开、允许..."
+            },
+            "smoothness": {
+                "label": "平顺度",
+                "options": {
+                    "bad": "强化轮胎：休旅自行车，汽车，人力车",
+                    "excellent": "轴承：溜冰，滑板",
+                    "good": "细轮：竞速自行车",
+                    "horrible": "越野：高负重越野车辆",
+                    "impassable": "禁止通行/禁止轮类交通工具",
+                    "intermediate": "轮胎：通勤脚踏车，轮椅，滑板车",
+                    "very_bad": "轻量化：低负重越野车辆",
+                    "very_horrible": "越野专用：拖拉机，全地形越野车"
+                },
+                "placeholder": "轴承，轮胎，越野"
+            },
+            "social_facility_for": {
+                "label": "服务对象",
+                "placeholder": "无家可归者，残疾人，儿童等"
+            },

             "source": {
                 "label": "来源"
             },
             "sport": {
                 "label": "运动"
             },
             "source": {
                 "label": "来源"
             },
             "sport": {
                 "label": "运动"
             },

+            "sport_ice": {
+                "label": "体育"
+            },
+            "sport_racing": {
+                "label": "运动"
+            },

             "structure": {
                 "label": "结构",
             "structure": {
                 "label": "结构",

-                "placeholder": "未知种类",

                 "options": {
                     "bridge": "桥",
                 "options": {
                     "bridge": "桥",

-                    "tunnel": "隧道",
+                    "cutting": "开凿",

                     "embankment": "堤岸",
                     "embankment": "堤岸",

-                    "cutting": "开凿"
-                }
+                    "ford": "浅滩",
+                    "tunnel": "隧道"
+                },
+                "placeholder": "未知种类"

             },
             "studio_type": {
                 "label": "类型"
             },
             },
             "studio_type": {
                 "label": "类型"
             },

+            "substation": {
+                "label": "类型"
+            },

             "supervised": {
                 "label": "监督"
             },
             "surface": {
             "supervised": {
                 "label": "监督"
             },
             "surface": {

-                "label": "表面"
+                "label": "路面铺设"
+            },
+            "tactile_paving": {
+                "label": "人行道视障引导设施"
+            },
+            "takeaway": {
+                "label": "外卖",
+                "options": {
+                    "no": "否",
+                    "only": "仅限外卖",
+                    "yes": "是"
+                },
+                "placeholder": "是，否，仅限外卖"

             },
             "toilets/disposal": {
             },
             "toilets/disposal": {

-                "label": "废弃"
+                "label": "废弃",
+                "options": {
+                    "bucket": "尿筒",
+                    "chemical": "化工",
+                    "flush": "冲水式",
+                    "pitlatrine": "旱厕/翼坑"
+                }

             },
             "tourism": {
                 "label": "类型"
             },
             "tourism": {
                 "label": "类型"


@@ -790,13 +1403,30 @@
                 "label": "塔型"
             },
             "tracktype": {
                 "label": "塔型"
             },
             "tracktype": {

-                "label": "类型"
+                "label": "产业道路种类",
+                "options": {
+                    "grade1": "刚性铺面：铺面为柏油，水泥或由刚性材质密实组成",
+                    "grade2": "近刚性铺面：砾石与石块混合柔性材质",
+                    "grade3": "混合刚性与柔性材质",
+                    "grade4": "近柔性铺面：土壤，砂土与草地混合其他刚性材质",
+                    "grade5": "柔性铺面：只有土壤，砂土与草地"
+                },
+                "placeholder": "坚硬地面，硬物铺面，软铺面"

             },
             "trail_visibility": {
             },
             "trail_visibility": {

-                "label": "路径可见度"
+                "label": "路径可见度",
+                "options": {
+                    "bad": "差劲：没有标示，路径有时候消失",
+                    "excellent": "良好：路径明显或标示充分",
+                    "good": "尚可：有标示但可能不明显",
+                    "horrible": "可怕：路径常消失，需要部分定向能力",
+                    "intermediate": "略差：标示稀少，路径大致可见",
+                    "no": "无：没有路径，需具备完整的定向能力"
+                },
+                "placeholder": "良好，尚可，稍差..."

             },
             },

-            "tree_type": {
-                "label": "类型"
+            "trees": {
+                "label": "树林"

             },
             "tunnel": {
                 "label": "隧道"
             },
             "tunnel": {
                 "label": "隧道"


@@ -807,6 +1437,9 @@
             "water": {
                 "label": "类型"
             },
             "water": {
                 "label": "类型"
             },

+            "water_point": {
+                "label": "饮水点"
+            },

             "waterway": {
                 "label": "类型"
             },
             "waterway": {
                 "label": "类型"
             },


@@ -820,11 +1453,11 @@
             "wheelchair": {
                 "label": "轮椅通道"
             },
             "wheelchair": {
                 "label": "轮椅通道"
             },

+            "width": {
+                "label": "宽度(米)"
+            },

             "wikipedia": {
                 "label": "维基百科"
             "wikipedia": {
                 "label": "维基百科"

-            },
-            "wood": {
-                "label": "类型"

             }
         },
         "presets": {
             }
         },
         "presets": {


@@ -837,7 +1470,20 @@
                 "terms": "缆车线路"
             },
             "aerialway/cable_car": {
                 "terms": "缆车线路"
             },
             "aerialway/cable_car": {

-                "name": "缆车"
+                "name": "缆车",
+                "terms": "缆车, 索道车"
+            },
+            "aerialway/chair_lift": {
+                "name": "登山吊椅",
+                "terms": "座椅式索道,观光索道,升降椅"
+            },
+            "aerialway/gondola": {
+                "name": "贡多拉",
+                "terms": "长平底船,两头尖的平底船,狭长小船"
+            },
+            "aerialway/magic_carpet": {
+                "name": "魔毯电梯",
+                "terms": "魔毯,传送带式电梯"

             },
             "aerialway/pylon": {
                 "name": "缆车塔",
             },
             "aerialway/pylon": {
                 "name": "缆车塔",


@@ -903,6 +1549,9 @@
                 "name": "酒吧",
                 "terms": "酒吧"
             },
                 "name": "酒吧",
                 "terms": "酒吧"
             },

+            "amenity/bbq": {
+                "name": "烧烤设施"
+            },

             "amenity/bench": {
                 "name": "长椅",
                 "terms": "长椅,长凳"
             "amenity/bench": {
                 "name": "长椅",
                 "terms": "长椅,长凳"


@@ -915,10 +1564,20 @@
                 "name": "自行车出租点",
                 "terms": "自行车租赁处,单车,出租,租赁,自行车"
             },
                 "name": "自行车出租点",
                 "terms": "自行车租赁处,单车,出租,租赁,自行车"
             },

+            "amenity/bicycle_repair_station": {
+                "name": "自行车修理站"
+            },

             "amenity/boat_rental": {
                 "name": "船舶租赁处",
                 "terms": "船舶租赁处"
             },
             "amenity/boat_rental": {
                 "name": "船舶租赁处",
                 "terms": "船舶租赁处"
             },

+            "amenity/bureau_de_change": {
+                "name": "货币兑换"
+            },
+            "amenity/bus_station": {
+                "name": "汽车站",
+                "terms": "公交车起讫站,公交枢纽,公交场站"
+            },

             "amenity/cafe": {
                 "name": "咖啡馆",
                 "terms": "咖啡厅,茶座,小餐馆,咖啡,小餐厅"
             "amenity/cafe": {
                 "name": "咖啡馆",
                 "terms": "咖啡厅,茶座,小餐馆,咖啡,小餐厅"


@@ -935,9 +1594,16 @@
                 "name": "洗车",
                 "terms": "洗车店,洗车"
             },
                 "name": "洗车",
                 "terms": "洗车店,洗车"
             },

+            "amenity/casino": {
+                "name": "赌场"
+            },
+            "amenity/charging_station": {
+                "name": "充电站",
+                "terms": "充电站"
+            },

             "amenity/childcare": {
             "amenity/childcare": {

-                "name": "托儿所",
-                "terms": "托儿所"
+                "name": "托儿所/保育园",
+                "terms": "幼儿园"

             },
             "amenity/cinema": {
                 "name": "电影院",
             },
             "amenity/cinema": {
                 "name": "电影院",


@@ -952,8 +1618,14 @@
                 "terms": "时钟,钟表,钟"
             },
             "amenity/college": {
                 "terms": "时钟,钟表,钟"
             },
             "amenity/college": {

-                "name": "学院",
-                "terms": "学院,书院,专科学院"
+                "name": "大专院校校园"
+            },
+            "amenity/community_centre": {
+                "name": "社区活动中心",
+                "terms": "活动室"
+            },
+            "amenity/compressed_air": {
+                "name": "压缩空气"

             },
             "amenity/courthouse": {
                 "name": "法院",
             },
             "amenity/courthouse": {
                 "name": "法院",


@@ -967,6 +1639,10 @@
                 "name": "医生办公室",
                 "terms": "医生"
             },
                 "name": "医生办公室",
                 "terms": "医生"
             },

+            "amenity/dojo": {
+                "name": "Dojo /武术学院",
+                "terms": "Dojo /武术学院"
+            },

             "amenity/drinking_water": {
                 "name": "饮水处",
                 "terms": "饮水处,饮水处,饮水"
             "amenity/drinking_water": {
                 "name": "饮水处",
                 "terms": "饮水处,饮水处,饮水"


@@ -996,12 +1672,10 @@
                 "terms": "墓地,坟地"
             },
             "amenity/hospital": {
                 "terms": "墓地,坟地"
             },
             "amenity/hospital": {

-                "name": "医院",
-                "terms": "医院,医疗院,医学中心"
+                "name": "医院"

             },
             "amenity/kindergarten": {
             },
             "amenity/kindergarten": {

-                "name": "幼儿园",
-                "terms": "幼儿园,幼稚园"
+                "name": "学前班/幼儿园用地"

             },
             "amenity/library": {
                 "name": "图书馆",
             },
             "amenity/library": {
                 "name": "图书馆",


@@ -1011,10 +1685,20 @@
                 "name": "市场",
                 "terms": "市场,菜市场"
             },
                 "name": "市场",
                 "terms": "市场,菜市场"
             },

+            "amenity/motorcycle_parking": {
+                "name": "摩托车停车场"
+            },
+            "amenity/nightclub": {
+                "name": "夜总会",
+                "terms": "夜店,夜总会"
+            },

             "amenity/parking": {
                 "name": "停车场",
                 "terms": "停车"
             },
             "amenity/parking": {
                 "name": "停车场",
                 "terms": "停车"
             },

+            "amenity/parking_entrance": {
+                "name": "停车场入口/出口"
+            },

             "amenity/pharmacy": {
                 "name": "药店",
                 "terms": "药房,药店"
             "amenity/pharmacy": {
                 "name": "药店",
                 "terms": "药房,药店"


@@ -1028,7 +1712,7 @@
                 "terms": "寺庙,佛堂,和尚寺,尼姑庵"
             },
             "amenity/place_of_worship/christian": {
                 "terms": "寺庙,佛堂,和尚寺,尼姑庵"
             },
             "amenity/place_of_worship/christian": {

-                "name": "教堂",
+                "name": "基督教堂",

                 "terms": "教堂"
             },
             "amenity/place_of_worship/jewish": {
                 "terms": "教堂"
             },
             "amenity/place_of_worship/jewish": {


@@ -1055,25 +1739,44 @@
                 "name": "酒馆",
                 "terms": "酒馆"
             },
                 "name": "酒馆",
                 "terms": "酒馆"
             },

+            "amenity/public_bookcase": {
+                "name": "公共书架"
+            },

             "amenity/ranger_station": {
                 "name": "野郊访客处",
                 "terms": "野郊访客处"
             },
             "amenity/recycling": {
             "amenity/ranger_station": {
                 "name": "野郊访客处",
                 "terms": "野郊访客处"
             },
             "amenity/recycling": {

+                "name": "资源回收设施",

                 "terms": "回收,循环利用,再造"
             },
                 "terms": "回收,循环利用,再造"
             },

+            "amenity/register_office": {
+                "name": "民政登记处"
+            },

             "amenity/restaurant": {
                 "name": "餐馆",
             "amenity/restaurant": {
                 "name": "餐馆",

-                "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼"
+                "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼,美食"

             },
             "amenity/school": {
             },
             "amenity/school": {

-                "name": "学校",
-                "terms": "学校，小学,中学"
+                "name": "学校"

             },
             "amenity/shelter": {
                 "name": "亭",
                 "terms": "棚,棚屋"
             },
             },
             "amenity/shelter": {
                 "name": "亭",
                 "terms": "棚,棚屋"
             },

+            "amenity/social_facility": {
+                "name": "社会服务设施"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "食品银行"
+            },
+            "amenity/social_facility/group_home": {
+                "name": "敬老院",
+                "terms": "敬老院,养老院,老年之家"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "流浪者庇护站"
+            },

             "amenity/studio": {
                 "name": "工作室",
                 "terms": "工作室"
             "amenity/studio": {
                 "name": "工作室",
                 "terms": "工作室"


@@ -1103,12 +1806,7 @@
                 "terms": "市政府,市政厅,大会堂"
             },
             "amenity/university": {
                 "terms": "市政府,市政厅,大会堂"
             },
             "amenity/university": {

-                "name": "大学",
-                "terms": "大学"
-            },
-            "amenity/vending_machine": {
-                "name": "售卖机",
-                "terms": "售卖机"
+                "name": "大学校园"

             },
             "amenity/veterinary": {
                 "name": "兽医",
             },
             "amenity/veterinary": {
                 "name": "兽医",


@@ -1122,6 +1820,9 @@
                 "name": "区域",
                 "terms": "区域"
             },
                 "name": "区域",
                 "terms": "区域"
             },

+            "area/highway": {
+                "name": "道路表面"
+            },

             "barrier": {
                 "name": "屏障",
                 "terms": "屏障,阻挡"
             "barrier": {
                 "name": "屏障",
                 "terms": "屏障,阻挡"


@@ -1147,8 +1848,8 @@
                 "terms": "自行车,单车,路障"
             },
             "barrier/ditch": {
                 "terms": "自行车,单车,路障"
             },
             "barrier/ditch": {

-                "name": "沟",
-                "terms": "沟"
+                "name": "壕沟",
+                "terms": "沟坎,壕"

             },
             "barrier/entrance": {
                 "name": "入口",
             },
             "barrier/entrance": {
                 "name": "入口",


@@ -1202,18 +1903,51 @@
                 "name": "公寓",
                 "terms": "公寓"
             },
                 "name": "公寓",
                 "terms": "公寓"
             },

+            "building/barn": {
+                "name": "谷仓",
+                "terms": "粮仓,畜棚,库房"
+            },
+            "building/bunker": {
+                "name": "煤仓",
+                "terms": "地堡"
+            },
+            "building/cabin": {
+                "name": "小木屋"
+            },
+            "building/college": {
+                "name": "大专院校建筑"
+            },

             "building/commercial": {
                 "name": "商业建筑物",
                 "terms": "商业建筑物"
             },
             "building/commercial": {
                 "name": "商业建筑物",
                 "terms": "商业建筑物"
             },

+            "building/construction": {
+                "name": "在建建筑"
+            },
+            "building/dormitory": {
+                "name": "宿舍"
+            },

             "building/entrance": {
             "building/entrance": {

-                "name": "入口",
-                "terms": "入口"
+                "name": "入口/出口",
+                "terms": "入口/出口,出入口"

             },
             "building/garage": {
             },
             "building/garage": {

-                "name": "车库",
+                "name": "车库(单个)",

                 "terms": "车库"
             },
                 "terms": "车库"
             },

+            "building/garages": {
+                "name": "车库(连排)"
+            },
+            "building/greenhouse": {
+                "name": "温室",
+                "terms": "大棚"
+            },
+            "building/hospital": {
+                "name": "医院大楼"
+            },
+            "building/hotel": {
+                "name": "宾馆楼"
+            },

             "building/house": {
                 "name": "房屋",
                 "terms": "房屋"
             "building/house": {
                 "name": "房屋",
                 "terms": "房屋"


@@ -1226,26 +1960,168 @@
                 "name": "工业建筑物",
                 "terms": "工业建筑物"
             },
                 "name": "工业建筑物",
                 "terms": "工业建筑物"
             },

+            "building/kindergarten": {
+                "name": "学前班/幼儿园建筑"
+            },
+            "building/public": {
+                "name": "公共建筑"
+            },

             "building/residential": {
                 "name": "住宅建筑物",
                 "terms": "住宅建筑物"
             },
             "building/residential": {
                 "name": "住宅建筑物",
                 "terms": "住宅建筑物"
             },

+            "building/retail": {
+                "name": "商业建筑"
+            },
+            "building/roof": {
+                "name": "楼顶",
+                "terms": "楼顶,房顶"
+            },
+            "building/school": {
+                "name": "学校建筑",
+                "terms": "校舍,学校建筑"
+            },
+            "building/shed": {
+                "terms": "储物间, 小木屋"
+            },
+            "building/train_station": {
+                "name": "火车站",
+                "terms": "火车站"
+            },
+            "building/university": {
+                "name": "大学建筑",
+                "terms": "大学建筑"
+            },
+            "building/warehouse": {
+                "name": "仓库",
+                "terms": "仓库,货栈"
+            },
+            "craft/beekeeper": {
+                "name": "养蜂人"
+            },
+            "craft/blacksmith": {
+                "name": "铁匠"
+            },
+            "craft/boatbuilder": {
+                "name": "制船"
+            },
+            "craft/bookbinder": {
+                "name": "装订工人",
+                "terms": "书籍钉装员,装订商,装订工,钉书匠"
+            },

             "craft/brewery": {
                 "name": "酿酒厂",
                 "terms": "酒厂,酿酒厂,酒坊"
             },
             "craft/brewery": {
                 "name": "酿酒厂",
                 "terms": "酒厂,酿酒厂,酒坊"
             },

+            "craft/carpenter": {
+                "name": "木匠"
+            },
+            "craft/carpet_layer": {
+                "name": "铺地毯的人"
+            },
+            "craft/caterer": {
+                "name": "酒席承办人"
+            },
+            "craft/clockmaker": {
+                "name": "钟表匠"
+            },
+            "craft/dressmaker": {
+                "name": "女装裁缝"
+            },
+            "craft/electrician": {
+                "name": "电工"
+            },
+            "craft/gardener": {
+                "name": "园艺工"
+            },
+            "craft/glaziery": {
+                "name": "装玻璃的人"
+            },
+            "craft/handicraft": {
+                "name": "手工匠"
+            },
+            "craft/hvac": {
+                "name": "高压交流电"
+            },
+            "craft/insulator": {
+                "name": "绝缘体"
+            },
+            "craft/jeweler": {
+                "name": "珠宝店"
+            },
+            "craft/key_cutter": {
+                "name": "切割钥匙（配匙）"
+            },
+            "craft/locksmith": {
+                "name": "锁匠"
+            },
+            "craft/metal_construction": {
+                "name": "金属结构建筑"
+            },
+            "craft/optician": {
+                "name": "眼镜店"
+            },
+            "craft/painter": {
+                "name": "油漆匠"
+            },
+            "craft/photographer": {
+                "name": "照相店",
+                "terms": "摄影师"
+            },
+            "craft/photographic_laboratory": {
+                "name": "照片冲洗店"
+            },
+            "craft/plasterer": {
+                "name": "泥水匠"
+            },
+            "craft/plumber": {
+                "name": "管道工"
+            },

             "craft/pottery": {
                 "name": "陶器场",
                 "terms": "陶器场"
             },
             "craft/pottery": {
                 "name": "陶器场",
                 "terms": "陶器场"
             },

+            "craft/rigger": {
+                "name": "装配工"
+            },
+            "craft/roofer": {
+                "name": "盖屋顶的人"
+            },
+            "craft/saddler": {
+                "name": "造马鞍的人"
+            },
+            "craft/sailmaker": {
+                "name": "修帆的人"
+            },

             "craft/sawmill": {
                 "name": "锯木厂",
                 "terms": "锯木厂"
             },
             "craft/sawmill": {
                 "name": "锯木厂",
                 "terms": "锯木厂"
             },

+            "craft/scaffolder": {
+                "name": "搭脚手架的人"
+            },
+            "craft/sculpter": {
+                "name": "雕刻师"
+            },
+            "craft/shoemaker": {
+                "name": "制鞋店"
+            },
+            "craft/stonemason": {
+                "name": "石匠"
+            },
+            "craft/sweep": {
+                "name": "扫烟囱的人"
+            },

             "craft/tailor": {
                 "name": "裁缝",
                 "terms": "裁缝"
             },
             "craft/tailor": {
                 "name": "裁缝",
                 "terms": "裁缝"
             },

+            "craft/tiler": {
+                "name": "砖瓦匠"
+            },
+            "craft/tinsmith": {
+                "name": "锡制品手工店"
+            },

             "craft/upholsterer": {
                 "name": "室内装潢",
                 "terms": "室内装潢,室内设计,室内装饰"
             "craft/upholsterer": {
                 "name": "室内装潢",
                 "terms": "室内装潢,室内设计,室内装饰"


@@ -1254,6 +2130,13 @@
                 "name": "制表商",
                 "terms": "钟表制作,制表商,钟表匠"
             },
                 "name": "制表商",
                 "terms": "钟表制作,制表商,钟表匠"
             },

+            "craft/window_construction": {
+                "name": "窗户修理店"
+            },
+            "craft/winery": {
+                "name": "酿酒厂",
+                "terms": "酒庄,酒厂"
+            },

             "embankment": {
                 "name": "堤坝",
                 "terms": "堤,堤坝,堤岸"
             "embankment": {
                 "name": "堤坝",
                 "terms": "堤,堤坝,堤岸"


@@ -1271,17 +2154,22 @@
                 "terms": "紧急电话"
             },
             "entrance": {
                 "terms": "紧急电话"
             },
             "entrance": {

-                "name": "入口",
-                "terms": "入口"
+                "name": "入口/出口",
+                "terms": "入口/出口,出入口"

             },
             },

-            "footway/crossing": {
-                "name": "路口",
-                "terms": "路口"
+            "footway/crosswalk": {
+                "name": "人行横道"

             },
             "footway/sidewalk": {
                 "name": "人行道",
                 "terms": "人行道,便道,走道"
             },
             },
             "footway/sidewalk": {
                 "name": "人行道",
                 "terms": "人行道,便道,走道"
             },

+            "ford": {
+                "name": "浅滩"
+            },
+            "golf/bunker": {
+                "name": "沙坑"
+            },

             "golf/fairway": {
                 "name": "高尔夫球道",
                 "terms": "球道,高尔夫球道"
             "golf/fairway": {
                 "name": "高尔夫球道",
                 "terms": "球道,高尔夫球道"


@@ -1293,10 +2181,16 @@
             "golf/hole": {
                 "name": "高尔夫球洞"
             },
             "golf/hole": {
                 "name": "高尔夫球洞"
             },

+            "golf/rough": {
+                "name": "深草区"
+            },

             "golf/tee": {
                 "name": "开球区",
                 "terms": "开球区,发球台"
             },
             "golf/tee": {
                 "name": "开球区",
                 "terms": "开球区,发球台"
             },

+            "golf/water_hazard": {
+                "name": "障碍水池"
+            },

             "highway": {
                 "name": "道路",
                 "terms": "公路"
             "highway": {
                 "name": "道路",
                 "terms": "公路"


@@ -1309,10 +2203,6 @@
                 "name": "公交车站",
                 "terms": "公交车站,巴士站"
             },
                 "name": "公交车站",
                 "terms": "公交车站,巴士站"
             },

-            "highway/crossing": {
-                "name": "路口",
-                "terms": "路口"
-            },

             "highway/cycleway": {
                 "name": "自行车道",
                 "terms": "自行车,单车"
             "highway/cycleway": {
                 "name": "自行车道",
                 "terms": "自行车,单车"


@@ -1334,8 +2224,8 @@
                 "terms": "高速公路"
             },
             "highway/motorway_junction": {
                 "terms": "高速公路"
             },
             "highway/motorway_junction": {

-                "name": "高速公路连接点",
-                "terms": "高速公路连接点"
+                "name": "高速公路交界处/出口",
+                "terms": "高速公路交界处/出口,入口/出口,出入口"

             },
             "highway/motorway_link": {
                 "name": "高速公路匝道",
             },
             "highway/motorway_link": {
                 "name": "高速公路匝道",


@@ -1346,8 +2236,7 @@
                 "terms": "路径"
             },
             "highway/pedestrian": {
                 "terms": "路径"
             },
             "highway/pedestrian": {

-                "name": "步行街",
-                "terms": "行人专用路"
+                "name": "步行街"

             },
             "highway/primary": {
                 "name": "主要道路",
             },
             "highway/primary": {
                 "name": "主要道路",


@@ -1357,6 +2246,9 @@
                 "name": "主要道路匝道",
                 "terms": "主要道路匝道"
             },
                 "name": "主要道路匝道",
                 "terms": "主要道路匝道"
             },

+            "highway/raceway": {
+                "name": "赛车赛道"
+            },

             "highway/residential": {
                 "name": "住宅区道路",
                 "terms": "住宅区道路"
             "highway/residential": {
                 "name": "住宅区道路",
                 "terms": "住宅区道路"


@@ -1413,6 +2305,9 @@
                 "name": "停车标志",
                 "terms": "停车标志"
             },
                 "name": "停车标志",
                 "terms": "停车标志"
             },

+            "highway/street_lamp": {
+                "name": "街灯"
+            },

             "highway/tertiary": {
                 "name": "三级道路",
                 "terms": "三级道路"
             "highway/tertiary": {
                 "name": "三级道路",
                 "terms": "三级道路"


@@ -1481,13 +2376,9 @@
                 "name": "路旁神龛",
                 "terms": "路边神社"
             },
                 "name": "路旁神龛",
                 "terms": "路边神社"
             },

-            "landuse": {
-                "name": "土地用途",
-                "terms": "土地用途"
-            },
-            "landuse/allotments": {
-                "name": "菜地",
-                "terms": "菜地,社区花园"
+            "junction": {
+                "name": "交叉口",
+                "terms": "交通枢纽,路口"

             },
             "landuse/basin": {
                 "name": "水池",
             },
             "landuse/basin": {
                 "name": "水池",


@@ -1497,21 +2388,19 @@
                 "name": "墓地",
                 "terms": "墓地"
             },
                 "name": "墓地",
                 "terms": "墓地"
             },

+            "landuse/churchyard": {
+                "name": "墓地",
+                "terms": "墓地"
+            },

             "landuse/commercial": {
             "landuse/commercial": {

-                "name": "商业区",
-                "terms": "商业区"
+                "name": "商业区"

             },
             "landuse/construction": {
             },
             "landuse/construction": {

-                "name": "建筑物",
+                "name": "建设用地",

                 "terms": "建筑物"
             },
             "landuse/farm": {
                 "terms": "建筑物"
             },
             "landuse/farm": {

-                "name": "农场",
-                "terms": "农场"
-            },
-            "landuse/farmland": {
-                "name": "农田",
-                "terms": "耕地,田地,饲养场"
+                "name": "农田"

             },
             "landuse/farmyard": {
                 "name": "农庄",
             },
             "landuse/farmyard": {
                 "name": "农庄",


@@ -1521,17 +2410,27 @@
                 "name": "森林",
                 "terms": "森林"
             },
                 "name": "森林",
                 "terms": "森林"
             },

+            "landuse/garages": {
+                "name": "车库",
+                "terms": "车库, 停车间"
+            },

             "landuse/grass": {
             "landuse/grass": {

-                "name": "è\8d\89å\9c°",
+                "name": "è\8d\89å\9dª",

                 "terms": "草地"
             },
             "landuse/industrial": {
                 "terms": "草地"
             },
             "landuse/industrial": {

-                "name": "工业区",
-                "terms": "工业区"
+                "name": "工业区"
+            },
+            "landuse/landfill": {
+                "name": "垃圾填埋区"

             },
             "landuse/meadow": {
             },
             "landuse/meadow": {

-                "name": "草地",
-                "terms": "牧场"
+                "name": "草甸",
+                "terms": "牧场,草场"
+            },
+            "landuse/military": {
+                "name": "军事区",
+                "terms": "军事用地, 军事区域"

             },
             "landuse/orchard": {
                 "name": "果园",
             },
             "landuse/orchard": {
                 "name": "果园",


@@ -1542,12 +2441,11 @@
                 "terms": "矿场"
             },
             "landuse/residential": {
                 "terms": "矿场"
             },
             "landuse/residential": {

-                "name": "住宅区",
-                "terms": "住宅区"
+                "name": "居民区",
+                "terms": "ä½\8få®\85å°\8få\8cº"

             },
             "landuse/retail": {
             },
             "landuse/retail": {

-                "name": "零售",
-                "terms": "零售"
+                "name": "零售场所"

             },
             "landuse/vineyard": {
                 "name": "葡萄园",
             },
             "landuse/vineyard": {
                 "name": "葡萄园",


@@ -1565,6 +2463,9 @@
                 "name": "狗公园",
                 "terms": "狗公园"
             },
                 "name": "狗公园",
                 "terms": "狗公园"
             },

+            "leisure/firepit": {
+                "name": "火炉"
+            },

             "leisure/garden": {
                 "name": "花园",
                 "terms": "花园"
             "leisure/garden": {
                 "name": "花园",
                 "terms": "花园"


@@ -1573,17 +2474,27 @@
                 "name": "高尔夫球场",
                 "terms": "高尔夫球场"
             },
                 "name": "高尔夫球场",
                 "terms": "高尔夫球场"
             },

+            "leisure/ice_rink": {
+                "name": "滑冰场",
+                "terms": "滑冰,滑冰场"
+            },

             "leisure/marina": {
                 "name": "码头",
                 "terms": "码头"
             },
             "leisure/marina": {
                 "name": "码头",
                 "terms": "码头"
             },

+            "leisure/nature_reserve": {
+                "name": "自然保护区"
+            },

             "leisure/park": {
                 "name": "公园",
                 "terms": "公园"
             },
             "leisure/park": {
                 "name": "公园",
                 "terms": "公园"
             },

+            "leisure/picnic_table": {
+                "name": "野餐桌"
+            },

             "leisure/pitch": {
             "leisure/pitch": {

-                "name": "体育场",
-                "terms": "运动场,运动场所"
+                "name": "运动场",
+                "terms": "体育场,运动场所,运动场地,操场"

             },
             "leisure/pitch/american_football": {
                 "name": "美式足球场",
             },
             "leisure/pitch/american_football": {
                 "name": "美式足球场",


@@ -1617,13 +2528,17 @@
                 "name": "儿童游乐场",
                 "terms": "游乐场"
             },
                 "name": "儿童游乐场",
                 "terms": "游乐场"
             },

+            "leisure/running_track": {
+                "name": "跑道",
+                "terms": "操场跑道"
+            },

             "leisure/slipway": {
                 "name": "船台",
                 "terms": "船台"
             },
             "leisure/sports_center": {
             "leisure/slipway": {
                 "name": "船台",
                 "terms": "船台"
             },
             "leisure/sports_center": {

-                "name": "体育,体育中心",
-                "terms": "体育中心"
+                "name": "体育中心/健身中心",
+                "terms": "体育中心,健身中心"

             },
             "leisure/stadium": {
                 "name": "体育场",
             },
             "leisure/stadium": {
                 "name": "体育场",


@@ -1634,8 +2549,7 @@
                 "terms": "游泳池"
             },
             "leisure/track": {
                 "terms": "游泳池"
             },
             "leisure/track": {

-                "name": "赛车跑道",
-                "terms": "赛车跑道"
+                "name": "赛道(非机动竞赛)"

             },
             "line": {
                 "name": "线",
             },
             "line": {
                 "name": "线",


@@ -1695,7 +2609,7 @@
             },
             "man_made/water_well": {
                 "name": "水井",
             },
             "man_made/water_well": {
                 "name": "水井",

-                "terms": "水井"
+                "terms": "水井, 取水点"

             },
             "man_made/water_works": {
                 "name": "供水厂",
             },
             "man_made/water_works": {
                 "name": "供水厂",


@@ -1729,6 +2643,9 @@
                 "name": "海滩",
                 "terms": "海滩"
             },
                 "name": "海滩",
                 "terms": "海滩"
             },

+            "natural/cave_entrance": {
+                "name": "洞口"
+            },

             "natural/cliff": {
                 "name": "峭壁",
                 "terms": "悬崖"
             "natural/cliff": {
                 "name": "峭壁",
                 "terms": "悬崖"


@@ -1773,6 +2690,9 @@
                 "name": "树",
                 "terms": "树"
             },
                 "name": "树",
                 "terms": "树"
             },

+            "natural/volcano": {
+                "name": "火山"
+            },

             "natural/water": {
                 "name": "水",
                 "terms": "水"
             "natural/water": {
                 "name": "水",
                 "terms": "水"


@@ -1881,6 +2801,9 @@
                 "name": "旅行社",
                 "terms": "旅行社"
             },
                 "name": "旅行社",
                 "terms": "旅行社"
             },

+            "piste": {
+                "name": "滑雪道"
+            },

             "place": {
                 "name": "地点",
                 "terms": "地点"
             "place": {
                 "name": "地点",
                 "terms": "地点"


@@ -1889,9 +2812,12 @@
                 "name": "城市",
                 "terms": "城市"
             },
                 "name": "城市",
                 "terms": "城市"
             },

+            "place/farm": {
+                "name": "农场"
+            },

             "place/hamlet": {
             "place/hamlet": {

-                "name": "村庄",
-                "terms": "村庄"
+                "name": "小村庄",
+                "terms": "村庄,村落"

             },
             "place/island": {
                 "name": "岛屿",
             },
             "place/island": {
                 "name": "岛屿",


@@ -1905,6 +2831,14 @@
                 "name": "地方",
                 "terms": "地方,地点"
             },
                 "name": "地方",
                 "terms": "地方,地点"
             },

+            "place/neighbourhood": {
+                "name": "街坊",
+                "terms": "社区,街坊"
+            },
+            "place/suburb": {
+                "name": "区",
+                "terms": "区"
+            },

             "place/town": {
                 "name": "城镇",
                 "terms": "城镇"
             "place/town": {
                 "name": "城镇",
                 "terms": "城镇"


@@ -1941,6 +2875,10 @@
                 "name": "变电站",
                 "terms": "变电站"
             },
                 "name": "变电站",
                 "terms": "变电站"
             },

+            "power/substation": {
+                "name": "变电所",
+                "terms": "变电站,配电所"
+            },

             "power/tower": {
                 "name": "高压电塔",
                 "terms": "高压电塔"
             "power/tower": {
                 "name": "高压电塔",
                 "terms": "高压电塔"


@@ -1950,7 +2888,7 @@
                 "terms": "变电所"
             },
             "public_transport/platform": {
                 "terms": "变电所"
             },
             "public_transport/platform": {

-                "name": "站台",
+                "name": "公交站台",

                 "terms": "平台,月台"
             },
             "public_transport/stop_position": {
                 "terms": "平台,月台"
             },
             "public_transport/stop_position": {


@@ -1970,17 +2908,13 @@
                 "terms": "废弃的铁路"
             },
             "railway/funicular": {
                 "terms": "废弃的铁路"
             },
             "railway/funicular": {

-                "name": "缆车",
+                "name": "缆索铁路",

                 "terms": "缆车"
             },
             "railway/halt": {
                 "name": "小火车站",
                 "terms": "小火车站"
             },
                 "terms": "缆车"
             },
             "railway/halt": {
                 "name": "小火车站",
                 "terms": "小火车站"
             },

-            "railway/level_crossing": {
-                "name": "平交道口",
-                "terms": "平交道口"
-            },

             "railway/monorail": {
                 "name": "单轨铁路",
                 "terms": "单轨铁路"
             "railway/monorail": {
                 "name": "单轨铁路",
                 "terms": "单轨铁路"


@@ -1990,7 +2924,7 @@
                 "terms": "窄轨铁路,铁路"
             },
             "railway/platform": {
                 "terms": "窄轨铁路,铁路"
             },
             "railway/platform": {

-                "name": "站台",
+                "name": "铁路站台",

                 "terms": "站台"
             },
             "railway/rail": {
                 "terms": "站台"
             },
             "railway/rail": {


@@ -2029,14 +2963,39 @@
                 "name": "酒水店",
                 "terms": "酒庄"
             },
                 "name": "酒水店",
                 "terms": "酒庄"
             },

+            "shop/anime": {
+                "name": "动漫店"
+            },
+            "shop/antiques": {
+                "name": "古董店"
+            },
+            "shop/art": {
+                "name": "画廊",
+                "terms": "美术馆,艺术馆"
+            },
+            "shop/baby_goods": {
+                "name": "婴儿用品店",
+                "terms": "母婴用品店, 婴幼儿用品店"
+            },
+            "shop/bag": {
+                "name": "箱包店",
+                "terms": "箱包店"
+            },

             "shop/bakery": {
                 "name": "面包店",
                 "terms": "面包店"
             },
             "shop/bakery": {
                 "name": "面包店",
                 "terms": "面包店"
             },

+            "shop/bathroom_furnishing": {
+                "name": "浴室家具店",
+                "terms": "水暖店"
+            },

             "shop/beauty": {
                 "name": "美容店",
                 "terms": "美容院"
             },
             "shop/beauty": {
                 "name": "美容店",
                 "terms": "美容院"
             },

+            "shop/bed": {
+                "name": "床上用品店"
+            },

             "shop/beverages": {
                 "name": "饮料店",
                 "terms": "饮品店"
             "shop/beverages": {
                 "name": "饮料店",
                 "terms": "饮品店"


@@ -2045,9 +3004,12 @@
                 "name": "自行车店",
                 "terms": "自行车,单车"
             },
                 "name": "自行车店",
                 "terms": "自行车,单车"
             },

+            "shop/bookmaker": {
+                "name": "书商"
+            },

             "shop/books": {
                 "name": "书店",
             "shop/books": {
                 "name": "书店",

-                "terms": "书店"
+                "terms": "书店, 书城"

             },
             "shop/boutique": {
                 "name": "精品店",
             },
             "shop/boutique": {
                 "name": "精品店",


@@ -2057,6 +3019,9 @@
                 "name": "肉店",
                 "terms": "肉铺"
             },
                 "name": "肉店",
                 "terms": "肉铺"
             },

+            "shop/candles": {
+                "name": "蜡烛店"
+            },

             "shop/car": {
                 "name": "汽车店",
                 "terms": "车行"
             "shop/car": {
                 "name": "汽车店",
                 "terms": "车行"


@@ -2069,10 +3034,19 @@
                 "name": "汽车修理店",
                 "terms": "汽车修理店"
             },
                 "name": "汽车修理店",
                 "terms": "汽车修理店"
             },

+            "shop/carpet": {
+                "name": "地毯店"
+            },
+            "shop/cheese": {
+                "name": "奶酪店"
+            },

             "shop/chemist": {
                 "name": "日化用品店",
                 "terms": "药房"
             },
             "shop/chemist": {
                 "name": "日化用品店",
                 "terms": "药房"
             },

+            "shop/chocolate": {
+                "name": "巧克力店"
+            },

             "shop/clothes": {
                 "name": "服装店",
                 "terms": "服装店"
             "shop/clothes": {
                 "name": "服装店",
                 "terms": "服装店"


@@ -2082,13 +3056,29 @@
                 "terms": "电脑店"
             },
             "shop/confectionery": {
                 "terms": "电脑店"
             },
             "shop/confectionery": {

-                "name": "糖果店",
-                "terms": "甜点店"
+                "name": "糖果店"

             },
             "shop/convenience": {
                 "name": "便利店",
                 "terms": "便利店"
             },
             },
             "shop/convenience": {
                 "name": "便利店",
                 "terms": "便利店"
             },

+            "shop/copyshop": {
+                "name": "打印店",
+                "terms": "打印社,复印店"
+            },
+            "shop/cosmetics": {
+                "name": "化妆品店",
+                "terms": "日化店"
+            },
+            "shop/craft": {
+                "name": "艺术/手工艺品店"
+            },
+            "shop/curtain": {
+                "name": "窗帘店"
+            },
+            "shop/dairy": {
+                "name": "牛奶店"
+            },

             "shop/deli": {
                 "name": "熟食店",
                 "terms": "熟食店"
             "shop/deli": {
                 "name": "熟食店",
                 "terms": "熟食店"


@@ -2102,17 +3092,22 @@
                 "terms": "DIY商店"
             },
             "shop/dry_cleaning": {
                 "terms": "DIY商店"
             },
             "shop/dry_cleaning": {

-                "name": "干洗店",
-                "terms": "干洗店"
+                "name": "干洗店"

             },
             "shop/electronics": {
                 "name": "电器店",
                 "terms": "电器店"
             },
             },
             "shop/electronics": {
                 "name": "电器店",
                 "terms": "电器店"
             },

+            "shop/fabric": {
+                "name": "布店"
+            },

             "shop/farm": {
                 "name": "农场",
                 "terms": "农场"
             },
             "shop/farm": {
                 "name": "农场",
                 "terms": "农场"
             },

+            "shop/fashion": {
+                "name": "服装店"
+            },

             "shop/fishmonger": {
                 "name": "海产店",
                 "terms": "海产店"
             "shop/fishmonger": {
                 "name": "海产店",
                 "terms": "海产店"


@@ -2121,6 +3116,9 @@
                 "name": "花店",
                 "terms": "花店"
             },
                 "name": "花店",
                 "terms": "花店"
             },

+            "shop/funeral_directors": {
+                "name": "墓园"
+            },

             "shop/furniture": {
                 "name": "家具店",
                 "terms": "家具店"
             "shop/furniture": {
                 "name": "家具店",
                 "terms": "家具店"


@@ -2155,20 +3153,29 @@
             },
             "shop/kiosk": {
                 "name": "报刊亭",
             },
             "shop/kiosk": {
                 "name": "报刊亭",

-                "terms": "报刊亭"
+                "terms": "书报亭"

             },
             "shop/laundry": {
                 "name": "洗衣店",
                 "terms": "洗衣店"
             },
             },
             "shop/laundry": {
                 "name": "洗衣店",
                 "terms": "洗衣店"
             },

+            "shop/leather": {
+                "name": "皮具店"
+            },

             "shop/locksmith": {
                 "name": "锁匠铺",
                 "terms": "锁匠铺"
             },
             "shop/locksmith": {
                 "name": "锁匠铺",
                 "terms": "锁匠铺"
             },

+            "shop/lottery": {
+                "name": "彩票店"
+            },

             "shop/mall": {
                 "name": "商场",
                 "terms": "商场"
             },
             "shop/mall": {
                 "name": "商场",
                 "terms": "商场"
             },

+            "shop/massage": {
+                "name": "按摩店"
+            },

             "shop/mobile_phone": {
                 "name": "手机店",
                 "terms": "手机店"
             "shop/mobile_phone": {
                 "name": "手机店",
                 "terms": "手机店"


@@ -2181,18 +3188,16 @@
                 "name": "音乐店",
                 "terms": "音乐店"
             },
                 "name": "音乐店",
                 "terms": "音乐店"
             },

+            "shop/musical_instrument": {
+                "name": "乐器店"
+            },

             "shop/newsagent": {
             "shop/newsagent": {

-                "name": "报摊",
-                "terms": "报摊"
+                "name": "报摊"

             },
             "shop/optician": {
                 "name": "眼镜店",
                 "terms": "眼镜店"
             },
             },
             "shop/optician": {
                 "name": "眼镜店",
                 "terms": "眼镜店"
             },

-            "shop/outdoor": {
-                "name": "户外用品店",
-                "terms": "户外用品店"
-            },

             "shop/pet": {
                 "name": "宠物店",
                 "terms": "宠物店"
             "shop/pet": {
                 "name": "宠物店",
                 "terms": "宠物店"


@@ -2201,6 +3206,12 @@
                 "name": "照相馆",
                 "terms": "照相馆"
             },
                 "name": "照相馆",
                 "terms": "照相馆"
             },

+            "shop/radiotechnics": {
+                "name": "音像制品店"
+            },
+            "shop/seafood": {
+                "name": "海鲜店"
+            },

             "shop/shoes": {
                 "name": "鞋店",
                 "terms": "鞋店"
             "shop/shoes": {
                 "name": "鞋店",
                 "terms": "鞋店"


@@ -2217,6 +3228,12 @@
                 "name": "超市",
                 "terms": "超级市场"
             },
                 "name": "超市",
                 "terms": "超级市场"
             },

+            "shop/tailor": {
+                "name": "裁缝"
+            },
+            "shop/tobacco": {
+                "name": "烟草店"
+            },

             "shop/toys": {
                 "name": "玩具店",
                 "terms": "玩具店"
             "shop/toys": {
                 "name": "玩具店",
                 "terms": "玩具店"


@@ -2241,6 +3258,16 @@
                 "name": "影像店",
                 "terms": "影像店"
             },
                 "name": "影像店",
                 "terms": "影像店"
             },

+            "shop/video_games": {
+                "name": "视频游戏店"
+            },
+            "shop/weapons": {
+                "name": "武器店"
+            },
+            "shop/wine": {
+                "name": "酒店",
+                "terms": "酒店,酒楼,酒坊"
+            },

             "tourism": {
                 "name": "旅行",
                 "terms": "旅行"
             "tourism": {
                 "name": "旅行",
                 "terms": "旅行"


@@ -2278,8 +3305,8 @@
                 "terms": "招待所"
             },
             "tourism/hotel": {
                 "terms": "招待所"
             },
             "tourism/hotel": {

-                "name": "酒店",
-                "terms": "酒店"
+                "name": "宾馆",
+                "terms": "宾馆,酒店,旅馆"

             },
             "tourism/information": {
                 "name": "信息",
             },
             "tourism/information": {
                 "name": "信息",


@@ -2325,6 +3352,34 @@
                 "name": "限制",
                 "terms": "限制"
             },
                 "name": "限制",
                 "terms": "限制"
             },

+            "type/restriction/no_left_turn": {
+                "name": "禁止左转",
+                "terms": "禁止左转弯"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "禁止右转",
+                "terms": "禁止右转弯"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "禁止直行",
+                "terms": "禁止直行"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "禁止掉头",
+                "terms": "禁止掉头"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "只左转",
+                "terms": "只左转"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "只右转",
+                "terms": "只右转"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "禁止转向",
+                "terms": "禁止转向"
+            },

             "type/route": {
                 "name": "线路",
                 "terms": "路线,路径"
             "type/route": {
                 "name": "线路",
                 "terms": "路线,路径"


@@ -2394,28 +3449,28 @@
                 "terms": "水坝"
             },
             "waterway/ditch": {
                 "terms": "水坝"
             },
             "waterway/ditch": {

-                "name": "沟",
-                "terms": "沟渠"
+                "name": "æ°´æ²\9f",
+                "terms": "沟,沟渠,涧"

             },
             "waterway/drain": {
                 "name": "渠",
                 "terms": "下水道"
             },
             "waterway/river": {
             },
             "waterway/drain": {
                 "name": "渠",
                 "terms": "下水道"
             },
             "waterway/river": {

-                "name": "河流",
-                "terms": "æ²³æµ\81"
+                "name": "河",
+                "terms": "æ±\9f,æ²³æµ\81,å·\9d"

             },
             "waterway/riverbank": {
             },
             "waterway/riverbank": {

-                "name": "河堤",
-                "terms": "河堤"
+                "name": "堤",
+                "terms": "岸,畔,河岸,河堤,河畔"

             },
             "waterway/stream": {
             },
             "waterway/stream": {

-                "name": "溪流",
-                "terms": "溪流"
+                "name": "溪",
+                "terms": "小河,小溪,涧,溪流"

             },
             "waterway/weir": {
                 "name": "堰",
             },
             "waterway/weir": {
                 "name": "堰",

-                "terms": "å ¤坝"
+                "terms": "å\9d\9d,å °å\9d\9d,æ\8b¦æ²³坝"

             }
         }
     }
             }
         }
     }