Skip to content

Commit c2eaed0

Browse files
committed
Skip if multiple-dojos-in-one style in Japan DB to be unique
1 parent 5a4c5ca commit c2eaed0

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

upsert_dojos_geojson.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
features = []
6161
description = ''
6262
japan_count = 0
63+
marked_dojos = []
6364
dojos_earth.each do |dojo|
6465
# Skip dojos that don't have required params to point on DojoMap
6566
if dojo[:latitude] && dojo[:longitude]
@@ -83,15 +84,15 @@
8384
# Show only active dojos in Japan area on DojoMap
8485
if dojo[:countryCode] == "JP"
8586

86-
# Skip if not existing or marked as inactive by Japan DB
87+
# Skip if not existing OR marked as 'Inactive' by Japan DB
8788
next if zen2japan[dojo[:name]].nil?
8889
next if name2is_active[zen2japan[dojo[:name]]] == false
8990

9091
# Convert Zen name into Japan name by Hash
9192
dojo[:name] = zen2japan[dojo[:name]] if zen2japan[dojo[:name]]
9293

9394
# Count active dojo in Japan displayed on DojoMap for debugging
94-
japan_count = japan_count.succ
95+
#japan_count = japan_count.succ
9596
#p "#{japan_count.to_s.rjust(3, '0')}: #{dojo[:name]}"
9697
end
9798

@@ -106,6 +107,12 @@
106107
HTML
107108
else
108109
# for Dojos regeisted in coderdojo.jp
110+
111+
# Skip if multiple-dojos-in-one style in Japan DB to be unique
112+
# e.g. '西宮・梅田', '藤井寺・柏原', '大田・邑南、他'
113+
next if marked_dojos.include? dojo[:name]
114+
marked_dojos << dojo[:name]
115+
109116
description = <<~HTML
110117
#{name2logo[dojo[:name]]}<br>
111118
<b>#{dojo[:name]}</b><br>
@@ -115,6 +122,7 @@
115122
HTML
116123
end
117124

125+
# Mark dojo to DojoMap
118126
features << {
119127
type: "Feature",
120128
geometry: {

0 commit comments

Comments
 (0)