Skip to content

City level location data #1449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ukutaht merged 23 commits into from
Nov 23, 2021
Merged

City level location data #1449

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4cae686
Merge branch 'plausible_master'
aymanterra Jul 26, 2021
e0855d6
Add City level details
aymanterra Aug 8, 2021
b3155fc
Add City level details
aymanterra Aug 8, 2021
f5870d3
Use ISO codes instead of geoname_id for subdivisions
ukutaht Aug 25, 2021
62fce41
Add easier way to configure geolocation database
ukutaht Aug 25, 2021
c9e5a77
Add workflow for dev branch
ukutaht Aug 25, 2021
7c34a95
Correct clickhouse migration
ukutaht Aug 25, 2021
34672ce
Translate subdivision names
ukutaht Aug 26, 2021
f11d66a
Translate city names
ukutaht Aug 26, 2021
a2e0f3a
WIP
ukutaht Sep 1, 2021
5f96992
Region and country filters
ukutaht Sep 3, 2021
5725d1b
Fix region filter
ukutaht Sep 3, 2021
49fd2bb
Remove region_name when removing region filter
ukutaht Sep 6, 2021
5d9f61a
Add modals for regions and cities
ukutaht Sep 7, 2021
1a9f614
Remove dead code
ukutaht Sep 7, 2021
3202bf2
WIP
ukutaht Sep 9, 2021
c891479
Revert "WIP"
ukutaht Nov 5, 2021
2a5bc3f
Feature flag to hide cities when deployed
ukutaht Nov 5, 2021
9b5d59e
Add changelog entry
ukutaht Nov 5, 2021
8971f12
Remove unused code
ukutaht Nov 5, 2021
976f3e7
Remove unused variables
ukutaht Nov 5, 2021
4b1e1fc
Fix test
ukutaht Nov 5, 2021
46963b0
Merge branch 'master' into dev
ukutaht Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unused code
  • Loading branch information
@ukutaht
ukutaht committed Nov 5, 2021
commit 8971f124efcb80eee1bed12b90e1daa5253501b2
1 change: 1 addition & 0 deletions config/.env.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ SELFHOST=false
DISABLE_CRON=true
ADMIN_USER_IDS=1
IP_GEOLOCATION_DB=/home/uku/plausible/analytics/city_database.mmdb
SHOW_CITIES=true
83 changes: 0 additions & 83 deletions lib/plausible/stats/clickhouse.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,89 +826,6 @@ defmodule Plausible.Stats.Clickhouse do
|> add_percentages
end

def subdivisions1(site, query, country_name) do
country = Plausible.Stats.CountryName.to_alpha2(country_name)

ClickhouseRepo.all(
from e in base_query_w_sessions(site, query),
group_by: e.country_code,
group_by: e.subdivision1_code,
where: e.country_code == ^country,
order_by: [desc: uniq(e.user_id)],
limit: 9,
select: %{
name: fragment("if(? = '' , 'Other', ?)", e.subdivision1_code, e.subdivision1_code),
count: uniq(e.user_id)
}
)
|> Enum.map(fn stat ->
iso_code = stat[:name]

Map.put(stat, :name, Plausible.Stats.CountryName.from_iso3166_2(iso_code))
end)
|> add_percentages
end

def subdivisions2(site, query, country_name, subdivision1_code) do
country = Plausible.Stats.CountryName.to_alpha2(country_name)

subdivision1 =
case subdivision1_code do
"Other" -> ""
name -> Plausible.Stats.CountryName.to_iso3166_2(name)
end

ClickhouseRepo.all(
from e in base_query_w_sessions(site, query),
group_by: e.country_code,
group_by: e.subdivision1_code,
group_by: e.subdivision2_code,
where: e.country_code == ^country,
where: e.subdivision1_code == ^subdivision1,
order_by: [desc: uniq(e.user_id)],
select: %{
name: fragment("if(? = '' , 'Other', ?)", e.subdivision2_code, e.subdivision2_code),
count: uniq(e.user_id)
}
)
|> Enum.map(fn stat ->
iso_code = stat[:name]

Map.put(stat, :name, Plausible.Stats.CountryName.from_iso3166_2(iso_code))
end)
|> add_percentages
end

def cities(site, query, country_name, subdivision1_code) do
country = Plausible.Stats.CountryName.to_alpha2(country_name)

subdivision1 =
case subdivision1_code do
"Other" -> ""
name -> Plausible.Stats.CountryName.to_iso3166_2(name)
end

ClickhouseRepo.all(
from e in base_query_w_sessions(site, query),
group_by: e.country_code,
group_by: e.subdivision1_code,
group_by: e.subdivision2_code,
group_by: e.city_geoname_id,
where: e.country_code == ^country,
where: e.subdivision1_code == ^subdivision1,
order_by: [desc: uniq(e.user_id)],
select: %{
name: e.city_geoname_id,
count: uniq(e.user_id)
}
)
|> Enum.map(fn stat ->
geoname_id = stat[:name]
Map.put(stat, :name, Plausible.Stats.CountryName.from_geoname_id(geoname_id, "N/A"))
end)
|> add_percentages
end

def browsers(site, query, limit \\ 5) do
ClickhouseRepo.all(
from e in base_query_w_sessions(site, query),
Expand Down