return name and reference separately

2016-09-05 09:01:51 -04:00
parent 938dff011f
commit dcc1b5ab2b
29 changed files with 131 additions and 74 deletions
@@ -150,16 +150,15 @@ function way_function (way, result)
  local surface = way:get_value_by_key("surface")

   -- name
-  if ref and "" ~= ref and name and "" ~= name then
-    result.name = name .. " (" .. ref .. ")"
-    elseif ref and "" ~= ref then
-      result.name = ref
-  elseif name and "" ~= name then
+  if name and "" ~= name then
    result.name = name
  elseif highway and fallback_names then
    result.name = "{highway:"..highway.."}"  -- if no name exists, use way type
                                            -- this encoding scheme is excepted to be a temporary solution
  end
+  if ref and "" ~= ref then
+    result.ref = ref
+  end

    -- roundabouts
  if "roundabout" == junction then