X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d9d13a6204c58613d0bf39ed183aa8a02e6d6522..093d531509018337612ef6a0b009a458b016a90a:/settings/flex-base.lua diff --git a/settings/flex-base.lua b/settings/flex-base.lua index 9663f960..904401ce 100644 --- a/settings/flex-base.lua +++ b/settings/flex-base.lua @@ -1,6 +1,7 @@ -- Core functions for Nominatim import flex style. -- +local module = {} -- The single place table. place_table = osm2pgsql.define_table{ @@ -44,6 +45,17 @@ function Place.new(object, geom_func) return self end +function Place:clean(data) + for k, v in pairs(self.object.tags) do + if data.delete ~= nil and data.delete(k, v) then + self.object.tags[k] = nil + elseif data.extra ~= nil and data.extra(k, v) then + self.extratags[k] = v + self.object.tags[k] = nil + end + end +end + function Place:delete(data) if data.match ~= nil then for k, v in pairs(self.object.tags) do @@ -122,14 +134,17 @@ function Place:grab_address_parts(data) for k, v in pairs(self.object.tags) do local atype = data.groups(k, v) - if atype == 'main' then - self.has_name = true - self.address[strip_address_prefix(k)] = v - count = count + 1 - elseif atype == 'extra' then - self.address[strip_address_prefix(k)] = v - elseif atype ~= nil then - self.address[atype] = v + if atype ~= nil then + if atype == 'main' then + self.has_name = true + self.address[strip_address_prefix(k)] = v + count = count + 1 + elseif atype == 'extra' then + self.address[strip_address_prefix(k)] = v + else + self.address[atype] = v + end + self.object.tags[k] = nil end end end @@ -165,6 +180,7 @@ function Place:grab_name_parts(data) if atype ~= nil then self.names[k] = v + self.object.tags[k] = nil if atype == 'main' then self.has_name = true elseif atype == 'house' then @@ -264,7 +280,7 @@ function Place:write_row(k, v, save_extra_mains) end -function tag_match(data) +function module.tag_match(data) if data == nil or next(data) == nil then return nil end @@ -326,7 +342,7 @@ function tag_match(data) end -function key_group(data) +function module.tag_group(data) if data == nil or next(data) == nil then return nil end @@ -388,7 +404,7 @@ function osm2pgsql.process_node(object) return o:as_point() end - process_tags(Place.new(object, geom_func)) + module.process_tags(Place.new(object, geom_func)) end function osm2pgsql.process_way(object) @@ -403,28 +419,27 @@ function osm2pgsql.process_way(object) return geom end - process_tags(Place.new(object, geom_func)) + module.process_tags(Place.new(object, geom_func)) end -function relation_as_multipolygon(o) +function module.relation_as_multipolygon(o) return o:as_multipolygon() end -function relation_as_multiline(o) +function module.relation_as_multiline(o) return o:as_multilinestring():line_merge() end function osm2pgsql.process_relation(object) - local geom_func = RELATION_TYPES[object.tags.type] + local geom_func = module.RELATION_TYPES[object.tags.type] if geom_func ~= nil then - process_tags(Place.new(object, geom_func)) + module.process_tags(Place.new(object, geom_func)) end end -function process_tags(o) - o:delete{match = PRE_DELETE} - o:grab_extratags{match = PRE_EXTRAS} +function module.process_tags(o) + o:clean{delete = module.PRE_DELETE, extra = module.PRE_EXTRAS} -- Exception for boundary/place double tagging if o.object.tags.boundary == 'administrative' then @@ -434,10 +449,10 @@ function process_tags(o) end -- name keys - local fallback = o:grab_name_parts{groups=NAMES} + local fallback = o:grab_name_parts{groups=module.NAMES} -- address keys - if o:grab_address_parts{groups=ADDRESS_TAGS} > 0 and fallback == nil then + if o:grab_address_parts{groups=module.ADDRESS_TAGS} > 0 and fallback == nil then fallback = {'place', 'house', 'always'} end if o.address.country ~= nil and #o.address.country ~= 2 then @@ -448,28 +463,70 @@ function process_tags(o) end if o.address.interpolation ~= nil then - o:write_place('place', 'houses', 'always', SAVE_EXTRA_MAINS) + o:write_place('place', 'houses', 'always', module.SAVE_EXTRA_MAINS) return end - o:delete{match = POST_DELETE} - o:grab_extratags{match = POST_EXTRAS} + o:clean{delete = module.POST_DELETE, extra = module.POST_EXTRAS} -- collect main keys for k, v in pairs(o.object.tags) do - local ktype = MAIN_KEYS[k] + local ktype = module.MAIN_KEYS[k] if ktype == 'fallback' then if o.has_name then fallback = {k, v, 'named'} end elseif ktype ~= nil then - o:write_place(k, v, MAIN_KEYS[k], SAVE_EXTRA_MAINS) + o:write_place(k, v,module.MAIN_KEYS[k], module.SAVE_EXTRA_MAINS) end end if fallback ~= nil and o.num_entries == 0 then - o:write_place(fallback[1], fallback[2], fallback[3], SAVE_EXTRA_MAINS) + o:write_place(fallback[1], fallback[2], fallback[3], module.SAVE_EXTRA_MAINS) end end +--------- Convenience functions for simple style configuration ----------------- + +function module.set_prefilters(data) + module.PRE_DELETE = module.tag_match{keys = data.delete_keys, tags = data.delete_tags} + module.PRE_EXTRAS = module.tag_match{keys = data.extratag_keys, + tags = data.extratag_tags} +end + +function module.set_main_tags(data) + module.MAIN_KEYS = data +end + +function module.set_name_tags(data) + module.NAMES = module.tag_group(data) +end + +function module.set_address_tags(data) + module.ADDRESS_TAGS = module.tag_group(data) +end + +function module.set_unused_handling(data) + if data.extra_keys == nil and data.extra_tags == nil then + module.POST_DELETE = module.tag_match{data.delete_keys, tags = data.delete_tags} + module.POST_EXTRAS = nil + module.SAVE_EXTRA_MAINS = true + elseif data.delete_keys == nil and data.delete_tags == nil then + module.POST_DELETE = nil + module.POST_EXTRAS = module.tag_match{data.extra_keys, tags = data.extra_tags} + module.SAVE_EXTRA_MAINS = false + else + error("unused handler can have only 'extra_keys' or 'delete_keys' set.") + end +end + +------ defaults -------------- + +module.RELATION_TYPES = { + multipolygon = module.relation_as_multipolygon, + boundary = module.relation_as_multipolygon, + waterway = module.relation_as_multiline +} + +return module