Skip to content
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

Jump to bottom

Fix map extent and mobile demos #74

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Fix map extent and mobile demos #74

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
8 changes: 4 additions & 4 deletions public/config/ramp3/accessibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@
{
"id": "EXT_NRCAN_Lambert_3978",
"default": {
"xmax": 5447881.694395057,
"xmin": -9606940.081915164,
"ymax": 7980119.028151724,
"ymin": -1280316.159385319
"xmin": -8888704.26,
"xmax": 4194967.74,
"ymin": -2216833.47,
"ymax": 5720682.40
},
"spatialReference": {
"wkid": 3978
Expand Down
8 changes: 4 additions & 4 deletions public/config/ramp3/datatypes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@
{
"id": "EXT_NRCAN_Lambert_3978",
"default": {
"xmax": 5986309.854584709,
"xmin": -9118782.855600713,
"ymax": 4152913.4570739144,
"ymin": -1601785.552324105
"xmin": -8888704.26,
"xmax": 4194967.74,
"ymin": -2216833.47,
"ymax": 5720682.40
},
"spatialReference": {
"wkid": 3978
Expand Down
8 changes: 4 additions & 4 deletions public/config/ramp3/mashups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
{
"id": "EXT_NRCAN_Lambert_3978",
"default": {
"xmax": 5970434.822834646,
"xmin": -9134657.887350775,
"ymax": 4200538.552324105,
"ymin": -1554160.4570739141
"xmin": -8888704.26,
"xmax": 4194967.74,
"ymin": -2216833.47,
"ymax": 5720682.40
},
"spatialReference": {
"wkid": 3978
Expand Down
14 changes: 7 additions & 7 deletions public/config/ramp3/mobile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"legend": {
"allowImport": false,
"isOpen": {
"large": true,
"medium": true,
"small": true
"large": false,
"medium": false,
"small": false
}
}
},
Expand Down Expand Up @@ -100,10 +100,10 @@
{
"id": "EXT_NRCAN_Lambert_3978",
"default": {
"xmax": 5962497.306959615,
"xmin": -9142595.403225806,
"ymax": 4779977.211201423,
"ymin": -974721.7981965962
"xmin": -2157378.42,
"xmax": 1533566.46,
"ymin": -933701.21,
"ymax": 3828808.32
},
"spatialReference": {
"wkid": 3978
Expand Down
8 changes: 4 additions & 4 deletions public/config/ramp4/accessibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@
{
"id": "EXT_NRCAN_Lambert_3978",
"default": {
"xmin": -9606940.081915164,
"xmax": 5447881.694395057,
"ymin": -1280316.159385319,
"ymax": 7980119.028151724,
"xmin": -8787066.68,
"xmax": 4283376.12,
"ymin": -2506427.01,
"ymax": 5431088.87,
"spatialReference": {
"wkid": 3978
}
Expand Down
8 changes: 4 additions & 4 deletions public/config/ramp4/datatypes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@
{
"id": "EXT_NRCAN_Lambert_3978",
"default": {
"xmin": -9118782.855600713,
"xmax": 5986309.854584709,
"ymin": -1601785.552324105,
"ymax": 4152913.4570739144,
"xmin": -8787066.68,
"xmax": 4283376.12,
"ymin": -2506427.01,
"ymax": 5431088.87,
"spatialReference": {
"wkid": 3978
}
Expand Down
8 changes: 4 additions & 4 deletions public/config/ramp4/mashups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@
{
"id": "EXT_NRCAN_Lambert_3978",
"default": {
"xmin": -9134657.887350775,
"xmax": 5970434.822834646,
"ymin": -1554160.4570739141,
"ymax": 4200538.552324105,
"xmin": -8787066.68,
"xmax": 4283376.12,
"ymin": -2506427.01,
"ymax": 5431088.87,
"spatialReference": {
"wkid": 3978
}
Expand Down
14 changes: 5 additions & 9 deletions public/config/ramp4/mobile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@
{
"id": "EXT_NRCAN_Lambert_3978",
"default": {
"xmin": -9142595.403225806,
"xmax": 5962497.306959615,
"ymin": -974721.7981965962,
"ymax": 4779977.211201423,
"xmin": -2157378.42,
"xmax": 1533566.46,
"ymin": -933701.21,
"ymax": 3828808.32,
"spatialReference": {
"wkid": 3978
}
Expand Down Expand Up @@ -373,11 +373,7 @@
]
},
"panels": {
"open": [
{
"id": "legend"
}
]
"open": []
},
"system": {
"animate": true,
Expand Down
21 changes: 14 additions & 7 deletions src/components/info/feature.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,15 @@
:id="`ramp-maps-${index}`"
v-else
>
<div class="image-container md:mr-[20px]" v-if="index % 2 !== 0">
<div
:class="{
'map-mobile-container md:mr-[20px]': index === 5,
'map-container md:mr-[20px]': index !== 5
}"
v-if="index % 2 !== 0"
>
<toggle-version @ramp3="openRAMP3" @ramp4="openRAMP4" :version="version" :key="version" />
<div class="rv-loading-screen" :class="{ 'rv-loaded': isVisible }">
<div class="rv-loading-screen" :class="{ 'rv-loaded': isVisible, '!min-w-[340px]': index === 5 }">
<div class="rv-loading-section rv-left"></div>
<div class="rv-loading-section rv-right"></div>
</div>
Expand Down Expand Up @@ -58,7 +64,7 @@
{{ $t('button.viewDemo') }}
</a>
</div>
<div class="image-container md:ml-[20px]" v-if="index % 2 === 0">
<div class="map-container md:ml-[20px]" v-if="index % 2 === 0">
<toggle-version @ramp3="openRAMP3" @ramp4="openRAMP4" :version="version" :key="version" />
<div class="rv-loading-screen" :class="{ 'rv-loaded': isVisible }">
<div class="rv-loading-section rv-left"></div>
Expand Down Expand Up @@ -173,12 +179,13 @@ export default class InfoFeatureV extends Vue {
</script>

<style scoped lang="scss">
.image-container {
.map-container {
@apply flex-1 overflow-hidden justify-center items-center min-h-[682px] w-[340px] sm:min-w-[485px] md:min-w-[485px] lg:min-w-[656px] xl:min-w-[827px] 2xl:min-w-[997px];
flex: 2;
img {
@apply max-h-[460px] sm:max-h-[500px] lg:max-h-[420px] xl:max-h-[510px];
}
}
.map-mobile-container {
@apply flex-1 overflow-hidden justify-center items-center min-h-[682px] min-w-[340px] max-w-[340px];
flex: 2;
}
.text-link {
@apply underline #{!important};
Expand Down
4 changes: 2 additions & 2 deletions src/components/info/toggle-version.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="flex flex-wrap">
<div class="flex">
<button
class="bg-teal py-[12px] px-[20px] rounded-lg border-gray-500 border focus:bg-teal-dark hover:bg-teal-dark !no-underline whitespace-nowrap font-bold ml-4 mr-4 mb-4"
class="bg-teal py-[12px] px-[20px] rounded-lg border-gray-500 border focus:bg-teal-dark hover:bg-teal-dark !no-underline whitespace-nowrap font-bold mr-4 mb-4"
:class="{ 'bg-teal-dark': version === 3 }"
type="button"
@click="ramp3"
Expand Down
23 changes: 14 additions & 9 deletions src/components/map.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
sagittis. Aenean iaculis maximus nulla, eget luctus mauris tincidunt sit amet. In feugiat ex est, ac
ultrices arcu pharetra at. Sed justo lacus, lacinia nec ex eget, semper ultrices enim. Nullam blandit
convallis lectus, quis dictum lectus maximus eget. Maecenas ex dolor, dictum a faucibus vitae,
sollicitudin sit amet augue. Aenean sollicitudin turpis in accumsan condimentum. Quisque lobortis odio a
orci pulvinar, dictum consequat erat tincidunt. Mauris sem magna, ornare lobortis laoreet in,
sollicitudin ac est.
sollicitudin sit amet augue.
</div>
<div id="text2">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tempus imperdiet urna, sit amet iaculis
Expand All @@ -26,9 +24,7 @@
elit. Duis fringilla varius est a malesuada. Sed aliquet cursus nibh, sed lacinia risus varius ac. Fusce
ut lectus eget odio volutpat imperdiet et ut mauris. Suspendisse sit amet consectetur neque. Donec
blandit molestie gravida. Praesent semper velit id lobortis tincidunt. Mauris tempus ipsum sit amet ex
semper, posuere porta tellus aliquam. Aenean porta nunc in tortor dignissim, vel facilisis lacus
egestas. Phasellus suscipit nisl ac est hendrerit egestas. Sed laoreet ultrices viverra. Lorem ipsum
dolor sit amet, consectetur adipiscing elit.
semper, posuere porta tellus aliquam.
</div>
<div id="ramp-map2" is="rv-map" class="h-[725px]" v-pre></div>
</div>
Expand Down Expand Up @@ -91,9 +87,18 @@ export default class RampMapV extends Vue {
this.$el.querySelector(updatedID)?.setAttribute('rv-plugins', 'swiper, draw');
}

if (this.config === 'sample_mobile') {
new RAMP.Map(this.$el.querySelector('#ramp-map2'), `./config/sample_mobile_medium.json`);
new RAMP.Map(this.$el.querySelector('#ramp-map3'), `./config/sample_mobile_small.json`);
if (this.id === `ramp-map${this.version}-5`) {
this.$el.querySelector(updatedID)?.classList.add('w-[340px]');
}

if (this.id === `ramp-demo${this.version}-mobile`) {
if (this.version === 3) {
new RAMP.Map(this.$el.querySelector('#ramp-map2'), `./config/ramp3/mobile.json`);
new RAMP.Map(this.$el.querySelector('#ramp-map3'), `./config/ramp3/mobile.json`);
} else if (this.version === 4) {
RAMP.createInstance(this.$el.querySelector('#ramp-map2'), require(`/public/config/ramp4/mobile.json`));
RAMP.createInstance(this.$el.querySelector('#ramp-map3'), require(`/public/config/ramp4/mobile.json`));
}

_window.$('#medium-text').css({
display: 'block',
Expand Down
Loading