Skip to content

Remove script include for now #4

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
Demotive merged 1 commit into from
Mar 16, 2026
Merged

Remove script include for now #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 0 additions & 47 deletions app/assets/javascript/map-scripts.js
View file
Open in desktop

This file was deleted.

53 changes: 51 additions & 2 deletions app/views/pre-alpha-flats/bso/bso-internal-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,61 @@ <h2 class="nhsuk-heading-m">BSO area</h2>
<script src="https://unpkg.com/maplibre-gl@5.3.0/dist/maplibre-gl.js"></script>
<script src="https://unpkg.com/@maplibre/maplibre-gl-leaflet@0.1.0/leaflet-maplibre-gl.js"></script>

<script src="/assets/javascript/map-scripts.js"></script>
<script>
function circleIcon({ fill = '#fff', stroke = '#000', strokeWidth = 2,
text = '', textColor = '#000', radius = 14, fillOpacity = 1 } = {}) {
const width = radius * 2;
const pointHeight = radius * 1.2;
const height = width + pointHeight;
const cx = radius;
const cy = radius;

return L.divIcon({
html: `<svg viewBox="0 0 ${width} ${height}" width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">
<!-- Stroke-only pin line -->
<line
x1="${cx}" y1="${cy + radius - strokeWidth}"
x2="${cx}" y2="${height - strokeWidth}"
stroke="${stroke}" stroke-width="${strokeWidth}"/>
<!-- Filled circle on top -->
<circle
cx="${cx}" cy="${cy}" r="${radius - strokeWidth}"
fill="${fill}" fill-opacity="${fillOpacity}" stroke="${stroke}" stroke-width="${strokeWidth}"/>
<!-- Text -->
<text x="${cx}" y="${cy}" text-anchor="middle" dominant-baseline="central"
fill="${textColor}" font-size="${radius * 0.9}" font-family="sans-serif" font-weight="bold">
${text}
</text>
</svg>`,
className: '',
iconSize: [width, height],
iconAnchor: [cx, height],
popupAnchor: [0, -height]
});
}

const landmarkIcons = {
orgLocation: circleIcon({ fill: '#fff9c4', text: 'O' }),
static: circleIcon({ fill: '#fff9c4', text: 'S' }),
mobile: circleIcon({ fill: '#ed8b00', text: 'M' }),
default: circleIcon({ fill: '#fff', text: '' }),
};

const mapOptions = {
attributionControl: false,
scrollWheelZoom: false
};

const map = L.map('app-map', {
maxZoom: 15
});
</script>

<script src="geo-bso-west-berks.js"></script>

<script>

const apiKey = 't9ErutMVGdziLrLqJbCM049xw5550C0e';
const apiKey = 'lWF9hAvJ3ALTasfGgV8MqmfAWJ2L9fhU';

landmarks.forEach(({ lat, lng, type, name }) => {
const icon = landmarkIcons[type] || landmarkIcons.default;
Expand Down
52 changes: 50 additions & 2 deletions app/views/pre-alpha-flats/location/location-location-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,58 @@ <h2 class="nhsuk-heading-s nhsuk-u-margin-bottom-0">Location notes for participa
<script src="https://unpkg.com/maplibre-gl@5.3.0/dist/maplibre-gl.js"></script>
<script src="https://unpkg.com/@maplibre/maplibre-gl-leaflet@0.1.0/leaflet-maplibre-gl.js"></script>

<script src="/assets/javascript/map-scripts.js"></script>
<script>
function circleIcon({ fill = '#fff', stroke = '#000', strokeWidth = 2,
text = '', textColor = '#000', radius = 14, fillOpacity = 1 } = {}) {
const width = radius * 2;
const pointHeight = radius * 1.2;
const height = width + pointHeight;
const cx = radius;
const cy = radius;

return L.divIcon({
html: `<svg viewBox="0 0 ${width} ${height}" width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">
<!-- Stroke-only pin line -->
<line
x1="${cx}" y1="${cy + radius - strokeWidth}"
x2="${cx}" y2="${height - strokeWidth}"
stroke="${stroke}" stroke-width="${strokeWidth}"/>
<!-- Filled circle on top -->
<circle
cx="${cx}" cy="${cy}" r="${radius - strokeWidth}"
fill="${fill}" fill-opacity="${fillOpacity}" stroke="${stroke}" stroke-width="${strokeWidth}"/>
<!-- Text -->
<text x="${cx}" y="${cy}" text-anchor="middle" dominant-baseline="central"
fill="${textColor}" font-size="${radius * 0.9}" font-family="sans-serif" font-weight="bold">
${text}
</text>
</svg>`,
className: '',
iconSize: [width, height],
iconAnchor: [cx, height],
popupAnchor: [0, -height]
});
}

const landmarkIcons = {
orgLocation: circleIcon({ fill: '#fff9c4', text: 'O' }),
static: circleIcon({ fill: '#fff9c4', text: 'S' }),
mobile: circleIcon({ fill: '#ed8b00', text: 'M' }),
default: circleIcon({ fill: '#fff', text: '' }),
};

const mapOptions = {
attributionControl: false,
scrollWheelZoom: false
};

const map = L.map('app-map', {
maxZoom: 15
});
</script>

<script>
const apiKey = 't9ErutMVGdziLrLqJbCM049xw5550C0e';
const apiKey = 'lWF9hAvJ3ALTasfGgV8MqmfAWJ2L9fhU';

const landmarks = [
{ lat: 51.4712253052667, lng: -0.09312137796810355, type: 'location', name: 'Camberwell Building' }
Expand Down