X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/44286b46b1962c3bf1d1568faf0a7f38a2a634c2..bb7f5ac2c8cf74669b421e7ae346a0cdd1ba5186:/lib/osm_community_index/local_chapter.rb

diff --git a/lib/osm_community_index/local_chapter.rb b/lib/osm_community_index/local_chapter.rb
index 6df3c1bc9..d83f13471 100644
--- a/lib/osm_community_index/local_chapter.rb
+++ b/lib/osm_community_index/local_chapter.rb
@@ -1,42 +1,7 @@
 module OsmCommunityIndex
   class LocalChapter
-    attr_reader :id, :url
-
-    def initialize(id, url)
-      @id = id
-      @url = url
-    end
-
-    def self.local_chapters
-      @chapters = init_local_chapters
-    end
-
-    def self.init_local_chapters
-      raw_local_chapters = load_raw_local_chapters
-      local_chapters = []
-      raw_local_chapters.each do |chapter|
-        id = chapter[:id]
-        url = chapter[:resource]["strings"]["url"]
-        local_chapters.push(LocalChapter.new(id, url))
-      end
-      local_chapters
-    end
-
-    def self.load_raw_local_chapters
-      community_index = OsmCommunityIndex.community_index
-      raw_local_chapters = []
-      community_index["resources"].each do |id, resource|
-        resource.each do |key, value|
-          next unless key == "type" && value == "osm-lc" && id != "OSMF"
-
-          raw_local_chapters.push({ :id => id, :resource => resource })
-        end
-      end
-      raw_local_chapters
-    end
-
     def self.add_to_i18n
-      raw_local_chapters = load_raw_local_chapters
+      local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF")
       files = Dir.glob(Rails.root.join("node_modules/osm-community-index/i18n/*"))
       files.each do |file|
         locale = File.basename(file, ".yaml")
@@ -45,14 +10,13 @@ module OsmCommunityIndex
         locale_rails = locale.tr("_", "-")
         data = {}
 
-        raw_local_chapters.each do |chapter|
+        local_chapters.each do |chapter|
           id = chapter[:id]
-          resource = chapter[:resource]
 
           strings = community_index_yaml[id] || {}
           # if the name isn't defined then fall back on community,
           # as per discussion here: https://github.com/osmlab/osm-community-index/issues/483
-          strings["name"] = strings["name"] || resource["strings"]["name"] || resource["strings"]["community"]
+          strings["name"] = strings["name"] || chapter["strings"]["name"] || chapter["strings"]["community"]
 
           data.deep_merge!({ "osm_community_index" => { "local_chapter" => { id => strings } } })
         end