Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
89c8d5f
fake commit for deploy
JoshuaVulcan Oct 10, 2025
e537d90
adding layer first pass
JoshuaVulcan Oct 24, 2025
5fca322
feat:scaffolding for new tracks vector layer. fix:map position saved …
JoshuaVulcan Nov 27, 2025
a6232f9
feat:scaffolding for new tracks vector layer. fix:map position saved …
JoshuaVulcan Nov 27, 2025
2dfe605
feat:segmentation by time and speed.
JoshuaVulcan Dec 3, 2025
7e0e1df
nit:linespacing
JoshuaVulcan Dec 4, 2025
ae302ea
fix:merge issue
JoshuaVulcan Dec 4, 2025
12c623c
fix:merge issue
JoshuaVulcan Dec 4, 2025
e08cf78
overwriting install-state.gz
JoshuaVulcan Dec 4, 2025
8474c1d
rm install state
JoshuaVulcan Dec 4, 2025
e845ec2
ignore install-state gz
JoshuaVulcan Dec 4, 2025
8b94a18
faster track selection for layer visibility
JoshuaVulcan Dec 16, 2025
9bd461b
feat:track arrow points for vector layer
JoshuaVulcan Feb 3, 2026
3c28409
feat: add SubjectTileLayer, fresh/stale subject dedup, track time env…
JoshuaVulcan Feb 9, 2026
b0c55ed
fix: update track segment filters to use start_time property
JoshuaVulcan Feb 9, 2026
b13e2ee
fix:click handler payload normalization for subject tiles
JoshuaVulcan Feb 10, 2026
c71544f
feat: limit subject bbox fetch to fresh subjects only
JoshuaVulcan Feb 10, 2026
1b70959
fix: resolve subject tile icons from Redux store instead of tile URL
JoshuaVulcan Feb 10, 2026
7496f24
Revert "fix: resolve subject tile icons from Redux store instead of t…
JoshuaVulcan Feb 10, 2026
c7a52cd
chore: merging up dev
JoshuaVulcan Feb 17, 2026
2c4efa0
merging up dev, fixing conflict
JoshuaVulcan Mar 12, 2026
67a5402
fix:decoupling geojson loading state from tracks visibility state, to…
JoshuaVulcan Mar 13, 2026
c57642a
adapting styles+patterns to vector tile representation of tracks + su…
JoshuaVulcan Mar 19, 2026
4730040
i18n updates
JoshuaVulcan Mar 19, 2026
9fed97b
feat:backed out of new time series API, restoring existing functional…
JoshuaVulcan Mar 27, 2026
bfc6bf5
test:dev setting for env
JoshuaVulcan Mar 27, 2026
d4bdd4f
tempt deployment config
JoshuaVulcan Mar 27, 2026
d2e07c7
tempt deployment config
JoshuaVulcan Mar 27, 2026
5f0b001
fix:merge conflicts
JoshuaVulcan Mar 27, 2026
2fe31e7
Update src/SubjectTileLayer/index.js
JoshuaVulcan Mar 30, 2026
f4a2956
fix:PR feedback.
JoshuaVulcan Mar 30, 2026
07b8392
fix:styling consistency between vector and geojson layers for subject…
JoshuaVulcan Mar 30, 2026
2a7bf6f
Merge branch 'ERA-8348' of github.com:PADAS/das-web-react into ERA-8348
JoshuaVulcan Mar 30, 2026
af0f0b7
more efficient TracksLayer handling for better performance combining …
JoshuaVulcan Mar 30, 2026
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# example: REACT_APP_FF_MAJOR_FEATURE=true or REACT_APP_FF_EXPERIMENTAL_THING=false

REACT_APP_MAPBOX_TOKEN=pk.eyJ1IjoidmpvZWxtIiwiYSI6ImNpZ3RzNXdmeDA4cm90N2tuZzhsd3duZm0ifQ.YcHUz9BmCk2oVOsL48VgVQ
REACT_APP_DAS_HOST=''
REACT_APP_DAS_HOST='https://playground.staging.pamdas.org'
REACT_APP_DAS_AUTH_TOKEN_URL=/oauth2/token/
REACT_APP_DAS_API_URL=/api/v1.0/
REACT_APP_DAS_API_V2_URL=/api/v2.0/
Expand Down
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REACT_APP_DAS_HOST=''
REACT_APP_DAS_HOST='https://playground.staging.pamdas.org'
REACT_APP_GA4_TRACKING_ID=G-1MVMZ0CMWF
REACT_APP_MOCK_EVENTS_API=false
REACT_APP_MOCK_EVENTTYPES_V2_API=false
Expand Down
2 changes: 1 addition & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GENERATE_SOURCEMAP=false
REACT_APP_DAS_HOST=''
REACT_APP_DAS_HOST='https://playground.staging.pamdas.org'
REACT_APP_ROUTE_PREFIX=/
REACT_APP_GA4_TRACKING_ID=G-B9CJEDN0BN
# PUBLIC_URL=/
Expand Down
79 changes: 79 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,85 @@
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

yarn
.yarn/install-state.gz
Comment thread
JoshuaVulcan marked this conversation as resolved.

# web-storm
/.idea

/.vscode

# Swap
[._]*.s[a-v][a-z]
!*.svg # comment out if you don't need vector files
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]

# Session
Session.vim
Sessionx.vim

# Temporary
.netrwhist
*~
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~
# -*- mode: gitignore; -*-
*~
\#*\#
/.emacs.desktop
/.emacs.desktop.lock
*.elc
auto-save-list
tramp
.\#*

# Org-mode
.org-id-locations
*_archive

# flymake-mode
*_flymake.*

# eshell files
/eshell/history
/eshell/lastdir

# elpa packages
/elpa/

# reftex files
*.rel

# AUCTeX auto folder
/auto/

# cask packages
.cask/
dist/

# Flycheck
flycheck_*.el

# server auth directory
/server/

# projectiles files
.projectile

# directory configuration
.dir-locals.el

# network security
/network-security.data
!.yarn/patches
!.yarn/plugins
!.yarn/releases
Expand Down
18 changes: 15 additions & 3 deletions public/locales/en-US/tracks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
"trackLegendItemsName": "patrols"
},
"subjectTrackLegend": {
"description": "{{pointCount}} points over {{trackTime}}",
"itemDescription_one": "{{count}} point",
"itemDescription_other": "{{count}} points",
"itemIcon": "Icon for {{title}}",
"trackLegendItemsName": "subjects"
"trackLegendItemsName": "subjects",
"popoverTriggerLabel": "Show date range and point count",
"tooltip": {
"dateRange": "{{from}} – {{until}}",
"untilNow": "now",
"pointCount": "{{count}} points",
"pointCountLoading": "Loading…",
"pointCountError": "Could not load point count"
}
},
"trackLegend": {
"clearTracksButton": "Clear Tracks",
Expand Down Expand Up @@ -57,7 +64,12 @@
"customLengthInputLabel": "Track length in days",
"eventFilterRadioLabel": "Match event filter \"from\" date ({{length}} days)",
"title": "Track Settings",
"trackLengthLegend": "Track Length"
"trackLengthLegend": "Track Length",
"segmentationLegend": "Segmentation Settings",
"segmentOnTimeLabel": "Segment on Time (seconds)",
"segmentOnSpeedLabel": "Segment on Speed (km/h)",
"timeGapInputLabel": "Time gap (seconds)",
"speedLimitInputLabel": "Speed limit (km/h)"
},
"trackSettingsButtonLabel": {
"closed": "Open the track settings",
Expand Down
18 changes: 15 additions & 3 deletions public/locales/es/tracks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
"trackLegendItemsName": "patrullas"
},
"subjectTrackLegend": {
"description": "{{pointCount}} puntos en {{trackTime}}",
"itemDescription_one": "{{count}} punto",
"itemDescription_other": "{{count}} puntos",
"itemIcon": "Icono para {{title}}",
"trackLegendItemsName": "sujetos"
"trackLegendItemsName": "sujetos",
"popoverTriggerLabel": "Mostrar rango de fechas y número de puntos",
"tooltip": {
"dateRange": "{{from}} – {{until}}",
"untilNow": "ahora",
"pointCount": "{{count}} puntos",
"pointCountLoading": "Cargando…",
"pointCountError": "No se pudo cargar el número de puntos"
}
},
"trackLegend": {
"clearTracksButton": "Limpiar trayectorias",
Expand Down Expand Up @@ -57,7 +64,12 @@
"customLengthInputLabel": "Duración de la trayectoria en días",
"eventFilterRadioLabel": "Coincidir con el filtro de eventos \"desde\" la fecha ({{length}} días)",
"title": "Configuración de trayectorias",
"trackLengthLegend": "Duración de la trayectoria"
"trackLengthLegend": "Duración de la trayectoria",
"segmentationLegend": "Configuración de segmentación",
"segmentOnTimeLabel": "Segmentar por tiempo (segundos)",
"segmentOnSpeedLabel": "Segmentar por velocidad (km/h)",
"timeGapInputLabel": "Intervalo de tiempo (segundos)",
"speedLimitInputLabel": "Límite de velocidad (km/h)"
},
"trackSettingsButtonLabel": {
"closed": "Abrir la configuración de trayectorias",
Expand Down
18 changes: 15 additions & 3 deletions public/locales/fr/tracks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
"trackLegendItemsName": "patrouilles"
},
"subjectTrackLegend": {
"description": "{{pointCount}} points sur {{trackTime}}",
"itemDescription_one": "{{count}} point",
"itemDescription_other": "{{count}} points",
"itemIcon": "Icône pour {{title}}",
"trackLegendItemsName": "sujets"
"trackLegendItemsName": "sujets",
"popoverTriggerLabel": "Afficher la plage de dates et le nombre de points",
"tooltip": {
"dateRange": "{{from}} – {{until}}",
"untilNow": "maintenant",
"pointCount": "{{count}} points",
"pointCountLoading": "Chargement…",
"pointCountError": "Impossible de charger le nombre de points"
}
},
"trackLegend": {
"clearTracksButton": "Effacer les trajectoires",
Expand Down Expand Up @@ -57,7 +64,12 @@
"customLengthInputLabel": "Durée de la trajectoire en jours",
"eventFilterRadioLabel": "Correspondre au filtre d'événements \"à partir de\" la date ({{length}} jours)",
"title": "Paramètres des trajectoires",
"trackLengthLegend": "Durée de la trajectoire"
"trackLengthLegend": "Durée de la trajectoire",
"segmentationLegend": "Paramètres de segmentation",
"segmentOnTimeLabel": "Segmenter par temps (secondes)",
"segmentOnSpeedLabel": "Segmenter par vitesse (km/h)",
"timeGapInputLabel": "Intervalle de temps (secondes)",
"speedLimitInputLabel": "Limite de vitesse (km/h)"
},
"trackSettingsButtonLabel": {
"closed": "Ouvrir les paramètres des trajectoires",
Expand Down
18 changes: 15 additions & 3 deletions public/locales/ne-NP/tracks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
"trackLegendItemsName": "गस्तीहरु"
},
"subjectTrackLegend": {
"description": "{{trackTime}} मा {{pointCount}} पोइन्टहरू",
"itemDescription_one": "{{count}} पोइन्ट",
"itemDescription_other": "{{count}} पोइन्टहरू",
"itemIcon": "{{title}} को आइकन",
"trackLegendItemsName": "विषयहरू"
"trackLegendItemsName": "विषयहरू",
"popoverTriggerLabel": "मिति दायरा र पोइन्ट गणना देखाउनुहोस्",
"tooltip": {
"dateRange": "{{from}} – {{until}}",
"untilNow": "अहिले",
"pointCount": "{{count}} पोइन्टहरू",
"pointCountLoading": "लोड हुँदैछ…",
"pointCountError": "पोइन्ट गणना लोड गर्न सकिएन"
}
},
"trackLegend": {
"clearTracksButton": "ट्र्याकहरू खाली गर्नुहोस्",
Expand Down Expand Up @@ -57,7 +64,12 @@
"customLengthInputLabel": "दिनमा ट्र्याक लम्बाइ",
"eventFilterRadioLabel": "इभेन्ट फिल्टर \"मिति\" सँग मिलाउनुहोस् ({{length}} दिन)",
"title": "ट्र्याक सेटिङहरू",
"trackLengthLegend": "ट्र्याक लम्बाइ"
"trackLengthLegend": "ट्र्याक लम्बाइ",
"segmentationLegend": "खण्डीकरण सेटिङहरू",
"segmentOnTimeLabel": "समय अनुसार खण्ड गर्नुहोस् (सेकेन्ड)",
"segmentOnSpeedLabel": "गति अनुसार खण्ड गर्नुहोस् (km/h)",
"timeGapInputLabel": "समय अन्तराल (सेकेन्ड)",
"speedLimitInputLabel": "गति सीमा (km/h)"
},
"trackSettingsButtonLabel": {
"closed": "ट्र्याक सेटिङहरू खोल्नुहोस्",
Expand Down
18 changes: 15 additions & 3 deletions public/locales/pt/tracks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
"trackLegendItemsName": "patrulhas"
},
"subjectTrackLegend": {
"description": "{{pointCount}} pontos ao longo de {{trackTime}}",
"itemDescription_one": "{{count}} ponto",
"itemDescription_other": "{{count}} pontos",
"itemIcon": "Ícone para {{title}}",
"trackLegendItemsName": "sujeitos"
"trackLegendItemsName": "sujeitos",
"popoverTriggerLabel": "Mostrar intervalo de datas e contagem de pontos",
"tooltip": {
"dateRange": "{{from}} – {{until}}",
"untilNow": "agora",
"pointCount": "{{count}} pontos",
"pointCountLoading": "A carregar…",
"pointCountError": "Não foi possível carregar a contagem de pontos"
}
},
"trackLegend": {
"clearTracksButton": "Limpar trajetórias",
Expand Down Expand Up @@ -57,7 +64,12 @@
"customLengthInputLabel": "Duração da trajetória em dias",
"eventFilterRadioLabel": "Corresponder ao filtro de eventos \"a partir de\" a data ({{length}} dias)",
"title": "Configurações de trajetórias",
"trackLengthLegend": "Duração da trajetória"
"trackLengthLegend": "Duração da trajetória",
"segmentationLegend": "Configurações de segmentação",
"segmentOnTimeLabel": "Segmentar por tempo (segundos)",
"segmentOnSpeedLabel": "Segmentar por velocidade (km/h)",
"timeGapInputLabel": "Intervalo de tempo (segundos)",
"speedLimitInputLabel": "Limite de velocidade (km/h)"
},
"trackSettingsButtonLabel": {
"closed": "Abrir configurações de trajetórias",
Expand Down
18 changes: 15 additions & 3 deletions public/locales/sw/tracks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
"trackLegendItemsName": "doria"
},
"subjectTrackLegend": {
"description": "Pointi {{pointCount}} kwa muda wa {{trackTime}}",
"itemDescription_one": "Pointi {{count}}",
"itemDescription_other": "Pointi {{count}}",
"itemIcon": "Ikoni ya {{title}}",
"trackLegendItemsName": "wasanii"
"trackLegendItemsName": "wasanii",
"popoverTriggerLabel": "Onyesha kipindi cha tarehe na idadi ya pointi",
"tooltip": {
"dateRange": "{{from}} – {{until}}",
"untilNow": "sasa",
"pointCount": "Pointi {{count}}",
"pointCountLoading": "Inapakia…",
"pointCountError": "Imeshindwa kupakia idadi ya pointi"
}
},
"trackLegend": {
"clearTracksButton": "Futa nyimbo",
Expand Down Expand Up @@ -57,7 +64,12 @@
"customLengthInputLabel": "Urefu wa wimbo kwa siku",
"eventFilterRadioLabel": "Linganisha na kichujio cha matukyo \"kuanzia\" tarehe ({{length}} siku)",
"title": "Mipangilio ya Nyimbo",
"trackLengthLegend": "Urefu wa Wimbo"
"trackLengthLegend": "Urefu wa Wimbo",
"segmentationLegend": "Mipangilio ya Ugawanyaji",
"segmentOnTimeLabel": "Gawanya kwa muda (sekunde)",
"segmentOnSpeedLabel": "Gawanya kwa kasi (km/h)",
"timeGapInputLabel": "Pengo la muda (sekunde)",
"speedLimitInputLabel": "Kikomo cha kasi (km/h)"
},
"trackSettingsButtonLabel": {
"closed": "Fungua mipangilio ya nyimbo",
Expand Down
Loading
Loading