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

Make road type choices exclusionary #53

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+96 −62
Open

Make road type choices exclusionary #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3c04d2
Make road type choices exclusionary
LihtsaltMats Mar 14, 2025
5618cc2
Make road type choices exclusionary
LihtsaltMats Mar 22, 2025
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
158 changes: 96 additions & 62 deletions WME ClickSaver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
dropdownHelperGroup: 'DROPDOWN HELPERS',
roadTypeButtons: 'Add road type buttons',
useOldRoadColors: 'Use old road colors (requires refresh)',
setCityToDefault: 'Keep default value',
setStreetCityToNone: 'Set Street/City to None (new seg\'s only)',
// eslint-disable-next-line camelcase
setStreetCityToNone_Title: 'NOTE: Only works if connected directly or indirectly'
Expand All @@ -88,6 +89,12 @@
addAltCityButtonText: 'Add alt city'
};

const roadTypeDropdownOption = {
DEFAULT: 'DEFAULT',
NONE: 'NONE',
CONNECTED_CITY: 'CONNECTED_CITY'
};

// Road types defined in the WME SDK documentation
const wmeRoadType = {
ALLEY: 22,
Expand Down Expand Up @@ -168,30 +175,31 @@
roadTypeButtons: ['St', 'PS', 'mH', 'MH', 'Fw', 'Rmp', 'PLR', 'PR', 'PB'],
parkingCostButtons: true,
parkingSpacesButtons: true,
setNewPLRStreetToNone: true,
setNewPLRCity: true,
setNewPRStreetToNone: false,
setNewPRCity: false,
setNewRRStreetToNone: true, // added by jm6087
setNewRRCity: false, // added by jm6087
setNewPBStreetToNone: true, // added by jm6087
setNewPBCity: true, // added by jm6087
setNewORStreetToNone: false,
setNewORCity: false,
setNewPLRCity: roadTypeDropdownOption.DEFAULT,
setNewPRCity: roadTypeDropdownOption.DEFAULT,
setNewRRCity: roadTypeDropdownOption.DEFAULT,
setNewPBCity: roadTypeDropdownOption.DEFAULT,
setNewORCity: roadTypeDropdownOption.DEFAULT,
addAltCityButton: true,
addSwapPedestrianButton: false,
useOldRoadColors: false,
warnOnPedestrianTypeSwap: true,
addCompactColors: true,
addSwitchPrimaryNameButton: false,
hideUncheckedRoadTypeButtons: false,
shortcuts: {}
};
_settings = { ...defaultSettings, ...loadedSettings };

setChecked('csRoadTypeButtonsCheckBox', _settings.roadButtons);
if (_settings.roadTypeButtons) {
Object.keys(roadTypeSettings).forEach(roadTypeAbbr1 => {
setChecked(`cs${roadTypeAbbr1}CheckBox`, _settings.roadTypeButtons.indexOf(roadTypeAbbr1) !== -1);
Object.keys(roadTypeSettings).forEach(roadTypeAbbr => {
const checked = _settings.roadTypeButtons.indexOf(roadTypeAbbr) !== -1;
const selector = `cs${roadTypeAbbr}CheckBox`;
setChecked(selector, checked);
if (!checked) {
$(`#${selector}`).siblings('.csDropdownContainer').hide();
}
});
}

Expand All @@ -202,16 +210,11 @@
}
// setChecked('csParkingSpacesButtonsCheckBox', _settings.parkingSpacesButtons);
// setChecked('csParkingCostButtonsCheckBox', _settings.parkingCostButtons);
setChecked('csSetNewPLRCityCheckBox', _settings.setNewPLRCity);
setChecked('csClearNewPLRCheckBox', _settings.setNewPLRStreetToNone);
setChecked('csSetNewPRCityCheckBox', _settings.setNewPRCity);
setChecked('csClearNewPRCheckBox', _settings.setNewPRStreetToNone);
setChecked('csSetNewRRCityCheckBox', _settings.setNewRRCity);
setChecked('csClearNewRRCheckBox', _settings.setNewRRStreetToNone); // added by jm6087
setChecked('csSetNewPBCityCheckBox', _settings.setNewPBCity);
setChecked('csClearNewPBCheckBox', _settings.setNewPBStreetToNone); // added by jm6087
setChecked('csSetNewORCityCheckBox', _settings.setNewORCity);
setChecked('csClearNewORCheckBox', _settings.setNewORStreetToNone);
setDropdownValue('csSetPLRCityDropdown', _settings.setNewPLRCity);
setDropdownValue('csSetPRCityDropdown', _settings.setNewPRCity);
setDropdownValue('csSetRRCityDropdown', _settings.setNewRRCity);
setDropdownValue('csSetPBCityDropdown', _settings.setNewPBCity);
setDropdownValue('csSetORCityDropdown', _settings.setNewORCity);
setChecked('csUseOldRoadColorsCheckBox', _settings.useOldRoadColors);
setChecked('csAddAltCityButtonCheckBox', _settings.addAltCityButton);
setChecked('csAddSwapPedestrianButtonCheckBox', _settings.addSwapPedestrianButton);
Expand All @@ -220,22 +223,21 @@
setChecked('csHideUncheckedRoadTypeButtonsCheckBox', _settings.hideUncheckedRoadTypeButtons);
}

function setDropdownValue(dropdownId, value) {
$(`#${dropdownId}`).val(value);
}

function saveSettingsToStorage() {
const settings = {
lastVersion: argsObject.scriptVersion,
roadButtons: _settings.roadButtons,
parkingCostButtons: _settings.parkingCostButtons,
parkingSpacesButtons: _settings.parkingSpacesButtons,
setNewPLRCity: _settings.setNewPLRCity,
setNewPLRStreetToNone: _settings.setNewPLRStreetToNone,
setNewPRCity: _settings.setNewPRCity,
setNewPRStreetToNone: _settings.setNewPRStreetToNone,
setNewRRCity: _settings.setNewRRCity,
setNewRRStreetToNone: _settings.setNewRRStreetToNone,
setNewPBCity: _settings.setNewPBCity,
setNewPBStreetToNone: _settings.setNewPBStreetToNone,
setNewORCity: _settings.setNewORCity,
setNewORStreetToNone: _settings.setNewORStreetToNone,
useOldRoadColors: _settings.useOldRoadColors,
addAltCityButton: _settings.addAltCityButton,
addSwapPedestrianButton: _settings.addSwapPedestrianButton,
Expand Down Expand Up @@ -307,7 +309,7 @@
};
let newCityId = sdk.DataModel.Cities.getCity(newCityProperties)?.id;
if (newCityId == null) {
newCityId = sdk.DataModel.Cities.addCity(newCityProperties);
newCityId = sdk.DataModel.Cities.addCity(newCityProperties).id;
}

// Process the street
Expand Down Expand Up @@ -397,17 +399,19 @@
}
});

if (roadType === roadTypeSettings.PLR.id && isChecked('csClearNewPLRCheckBox')) {
setStreetAndCity(isChecked('csSetNewPLRCityCheckBox'));
} else if (roadType === roadTypeSettings.PR.id && isChecked('csClearNewPRCheckBox')) {
setStreetAndCity(isChecked('csSetNewPRCityCheckBox'));
} else if (roadType === roadTypeSettings.RR.id && isChecked('csClearNewRRCheckBox')) {
setStreetAndCity(isChecked('csSetNewRRCityCheckBox'));
} else if (roadType === roadTypeSettings.PB && isChecked('csClearNewPBCheckBox')) {
setStreetAndCity(isChecked('csSetNewPBCityCheckBox'));
} else if (roadType === roadTypeSettings.OR.id && isChecked('csClearNewORCheckBox')) {
setStreetAndCity(isChecked('csSetNewORCityCheckBox'));
const roadTypeSettingsMap = {
[roadTypeSettings.PLR.id]: _settings.setNewPLRCity,
[roadTypeSettings.PR.id]: _settings.setNewPRCity,
[roadTypeSettings.RR.id]: _settings.setNewRRCity,
[roadTypeSettings.PB.id]: _settings.setNewPBCity,
[roadTypeSettings.OR.id]: _settings.setNewORCity,
};
const setting = roadTypeSettingsMap[roadType];

if (!setting || setting === roadTypeDropdownOption.DEFAULT) {
return;
}
setStreetAndCity(setting === roadTypeDropdownOption.CONNECTED_CITY);
// });
}

Expand Down Expand Up @@ -844,10 +848,36 @@
$(`<style type="text/css">${css}</style>`).appendTo('head');
}

function createSettingsDropdown(id, settingName, titleText, divCss, options, optionalAttributes) {
const $container = $('<div>', { class: 'controls-container' });
const $select = $('<select>', {
class: 'csSettingsControl',
id,
'data-setting-name': settingName
}).appendTo($container);
// TODO css
if (divCss) $container.css(divCss);
// TODO css
if (titleText) $container.attr({ title: titleText });
if (optionalAttributes) $select.attr(optionalAttributes);
options.forEach(option => {
$select.append($('<option>', {
value: option.value,
text: option.text
}));
});

return $container;
}

function createSettingsCheckbox(id, settingName, labelText, titleText, divCss, labelCss, optionalAttributes) {
const $container = $('<div>', { class: 'controls-container' });
const $input = $('<input>', {
type: 'checkbox', class: 'csSettingsCheckBox', name: id, id, 'data-setting-name': settingName
type: 'checkbox',
class: 'csSettingsControl',
name: id,
id,
'data-setting-name': settingName
}).appendTo($container);
const $label = $('<label>', { for: id }).text(labelText).appendTo($container);
// TODO css
Expand All @@ -868,31 +898,28 @@
const roadType = roadTypeSettings[roadTypeAbbr];
const id = `cs${roadTypeAbbr}CheckBox`;
const title = I18n.t('segment.road_types')[roadType.id];
$roadTypesDiv.append(
createSettingsCheckbox(id, 'roadType', title, null, null, null, {
'data-road-type': roadTypeAbbr
})
);
const $roadTypeContainer = createSettingsCheckbox(id, 'roadType', title, null, null, null, {
'data-road-type': roadTypeAbbr
});
$roadTypesDiv.append($roadTypeContainer);
if (['PLR', 'PR', 'RR', 'PB', 'OR'].includes(roadTypeAbbr)) { // added RR & PB by jm6087
$roadTypesDiv.append(
const $dropdownContainer = $('<div>', { class: 'csDropdownContainer' });
const options = [
{ value: roadTypeDropdownOption.DEFAULT, text: trans.prefs.setCityToDefault },
{ value: roadTypeDropdownOption.NONE, text: trans.prefs.setStreetCityToNone },
{ value: roadTypeDropdownOption.CONNECTED_CITY, text: trans.prefs.setCityToConnectedSegCity }
];
$dropdownContainer.append(
// TODO css
createSettingsCheckbox(
`csClearNew${roadTypeAbbr}CheckBox`,
`setNew${roadTypeAbbr}StreetToNone`,
trans.prefs.setStreetCityToNone,
trans.prefs.setStreetCityToNone_Title,
{ paddingLeft: '20px', marginRight: '4px' },
{ fontStyle: 'italic' }
),
createSettingsCheckbox(
`csSetNew${roadTypeAbbr}CityCheckBox`,
createSettingsDropdown(
`csSet${roadTypeAbbr}CityDropdown`,
`setNew${roadTypeAbbr}City`,
trans.prefs.setCityToConnectedSegCity,
'',
{ paddingLeft: '30px', marginRight: '4px' },
{ fontStyle: 'italic' }
{ paddingLeft: '20px', marginRight: '4px' },
options
)
);
$roadTypeContainer.append($dropdownContainer);
}
});

Expand Down Expand Up @@ -967,11 +994,14 @@
}
saveSettingsToStorage();
});
$('.csSettingsCheckBox').change(function onSettingsCheckChanged() {
$('.csSettingsControl').change(function onSettingsCheckChanged() {
const { checked } = this;
const settingName = $(this).data('setting-name');
const $this = $(this);
const settingName = $this.data('setting-name');
$this.siblings('.csDropdownContainer').toggle(checked);

if (settingName === 'roadType') {
const roadType = $(this).data('road-type');
const roadType = $this.data('road-type');
const array = _settings.roadTypeButtons;
const index = array.indexOf(roadType);
if (checked && index === -1) {
Expand All @@ -980,7 +1010,11 @@
array.splice(index, 1);
}
} else {
_settings[settingName] = checked;
if (settingName.includes('setNew') && settingName.includes('City')) {
_settings[settingName] = $this.val();
} else {
_settings[settingName] = checked;
}
}
saveSettingsToStorage();
});
Expand Down